Skip to content

Commit 768db58

Browse files
committed
fix CVE-2021-27568 in 2 packages
1 parent d07cf9f commit 768db58

File tree

5 files changed

+17
-13
lines changed

5 files changed

+17
-13
lines changed

json-smart-mini/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<parent>
1010
<groupId>net.minidev</groupId>
1111
<artifactId>parent</artifactId>
12-
<version>1.0.9-1</version>
12+
<version>1.3.2</version>
1313
<relativePath>../parent/pom.xml</relativePath>
1414
</parent>
1515

json-smart-mini/src/main/java/net/minidev/json/parser/JSONParserStream.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -250,9 +250,13 @@ private Object readNumber(boolean[] stop) throws ParseException, IOException {
250250
return sb.toString().trim();
251251
}
252252
String num = sb.toString().trim();
253-
if (num.length() > 18) // follow JSjonIJ parssing methode
254-
return new BigDecimal(num);
255-
return Double.parseDouble(num);
253+
try {
254+
if (num.length() > 18) // follow JSjonIJ parssing methode
255+
return new BigDecimal(num);
256+
return Double.parseDouble(num);
257+
} catch (NumberFormatException e) {
258+
throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs);
259+
}
256260
}
257261
sb.append('E');
258262
read();
@@ -266,7 +270,11 @@ private Object readNumber(boolean[] stop) throws ParseException, IOException {
266270
skipNQString(stop);
267271
return sb.toString().trim();
268272
}
269-
return Double.parseDouble(sb.toString().trim());
273+
try {
274+
return Double.parseDouble(sb.toString().trim());
275+
} catch (NumberFormatException e) {
276+
throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs);
277+
}
270278
} else {
271279
skipNQString(stop);
272280
return sb.toString().trim();

json-smart/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<parent>
1111
<groupId>net.minidev</groupId>
1212
<artifactId>parent</artifactId>
13-
<version>1.3.1</version>
13+
<version>1.3.2</version>
1414
<relativePath>../parent/pom.xml</relativePath>
1515
</parent>
1616

json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,17 +134,13 @@ public void checkLeadinZero() throws ParseException {
134134
protected Number extractFloat() throws ParseException {
135135
if (!acceptLeadinZero)
136136
checkLeadinZero();
137-
138137
try {
139138
if (!useHiPrecisionFloat)
140139
return Float.parseFloat(xs);
141-
142140
if (xs.length() > 18) // follow JSonIJ parsing method
143141
return new BigDecimal(xs);
144-
145142
return Double.parseDouble(xs);
146-
147-
} catch(NumberFormatException e){
143+
} catch(NumberFormatException e) {
148144
throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs);
149145
}
150146
}

parent/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<modelVersion>4.0.0</modelVersion>
44
<groupId>net.minidev</groupId>
55
<artifactId>parent</artifactId>
6-
<version>1.3.1</version>
6+
<version>1.3.2</version>
77
<name>Minidev public super pom</name>
88
<description>minidev common properties.</description>
99
<packaging>pom</packaging>
@@ -25,7 +25,7 @@
2525
<id>uriel</id>
2626
<name>Uriel Chemouni</name>
2727
<email>[email protected]</email>
28-
<timezone>GMT+1</timezone>
28+
<timezone>GMT+3</timezone>
2929
<roles>
3030
</roles>
3131
</developer>

0 commit comments

Comments
 (0)