Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Sign in / Register
Toggle navigation
S
spring-boot
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
DEMO
spring-boot
Commits
9bc68b98
Commit
9bc68b98
authored
Jan 09, 2020
by
Dmytro Nosan
Committed by
Madhura Bhave
Jan 15, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Limit ChronoField values to their range
See gh-19595
parent
faa38c94
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
6 deletions
+18
-6
CentralDirectoryFileHeader.java
...framework/boot/loader/jar/CentralDirectoryFileHeader.java
+18
-6
No files found.
spring-boot-project/spring-boot-tools/spring-boot-loader/src/main/java/org/springframework/boot/loader/jar/CentralDirectoryFileHeader.java
View file @
9bc68b98
/*
* Copyright 2012-20
19
the original author or authors.
* Copyright 2012-20
20
the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
...
...
@@ -17,8 +17,11 @@
package
org
.
springframework
.
boot
.
loader
.
jar
;
import
java.io.IOException
;
import
java.time.LocalDateTime
;
import
java.time.ZoneId
;
import
java.time.ZonedDateTime
;
import
java.time.temporal.ChronoField
;
import
java.time.temporal.ChronoUnit
;
import
java.time.temporal.ValueRange
;
import
org.springframework.boot.loader.data.RandomAccessData
;
...
...
@@ -124,10 +127,14 @@ final class CentralDirectoryFileHeader implements FileHeader {
* @return the date and time as milliseconds since the epoch
*/
private
long
decodeMsDosFormatDateTime
(
long
datetime
)
{
LocalDateTime
localDateTime
=
LocalDateTime
.
of
((
int
)
(((
datetime
>>
25
)
&
0x7f
)
+
1980
),
(
int
)
((
datetime
>>
21
)
&
0x0f
),
(
int
)
((
datetime
>>
16
)
&
0x1f
),
(
int
)
((
datetime
>>
11
)
&
0x1f
),
(
int
)
((
datetime
>>
5
)
&
0x3f
),
(
int
)
((
datetime
<<
1
)
&
0x3e
));
return
localDateTime
.
toEpochSecond
(
ZoneId
.
systemDefault
().
getRules
().
getOffset
(
localDateTime
))
*
1000
;
int
year
=
getChronoValue
(((
datetime
>>
25
)
&
0x7f
)
+
1980
,
ChronoField
.
YEAR
);
int
month
=
getChronoValue
((
datetime
>>
21
)
&
0x0f
,
ChronoField
.
MONTH_OF_YEAR
);
int
day
=
getChronoValue
((
datetime
>>
16
)
&
0x1f
,
ChronoField
.
DAY_OF_MONTH
);
int
hour
=
getChronoValue
((
datetime
>>
11
)
&
0x1f
,
ChronoField
.
HOUR_OF_DAY
);
int
minute
=
getChronoValue
((
datetime
>>
5
)
&
0x3f
,
ChronoField
.
MINUTE_OF_HOUR
);
int
second
=
getChronoValue
((
datetime
<<
1
)
&
0x3e
,
ChronoField
.
SECOND_OF_MINUTE
);
return
ZonedDateTime
.
of
(
year
,
month
,
day
,
hour
,
minute
,
second
,
0
,
ZoneId
.
systemDefault
()).
toInstant
()
.
truncatedTo
(
ChronoUnit
.
SECONDS
).
toEpochMilli
();
}
public
long
getCrc
()
{
...
...
@@ -172,4 +179,9 @@ final class CentralDirectoryFileHeader implements FileHeader {
return
fileHeader
;
}
private
static
int
getChronoValue
(
long
value
,
ChronoField
field
)
{
ValueRange
range
=
field
.
range
();
return
Math
.
toIntExact
(
Math
.
min
(
Math
.
max
(
value
,
range
.
getMinimum
()),
range
.
getMaximum
()));
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment