Skip to content

[#60][#62] Unchecked Exception in Parser #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 11 commits into from
Apr 30, 2021
Merged

[#60][#62] Unchecked Exception in Parser #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8840d53
Maven Plugin Update
dpeger Apr 23, 2021
b3d52aa
[#60][#62] Unchecked Exception in Parser
dpeger Apr 23, 2021
eabd85e
Version bump to 2.3.1
dpeger Apr 23, 2021
42e4e68
Test improvments
dpeger Apr 23, 2021
0af2cc1
Update README.md
dpeger Apr 23, 2021
2761141
Test improvments
dpeger Apr 23, 2021
47a5b02
Test improvments
dpeger Apr 23, 2021
340faf5
[#73] Avoid `String` creation using system default charset
dpeger Apr 23, 2021
306617d
Update README.md
dpeger Apr 23, 2021
dfb1ab7
Revert "Update README.md"
dpeger Apr 26, 2021
d08ad4f
Revert "[#73] Avoid `String` creation using system default charset"
dpeger Apr 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@

# Changelog

### *V 2.3.1*
* Fixes [issue #60](https://github.com/netplex/json-smart-v2/issues/60) (CVE-2021-27568)

### *V 2.3*
* Patch 37 [issue 37](http://code.google.com/p/json-smart/issues/detail?id=37)
* explicite support of char 127 [issue 18](http://code.google.com/p/json-smart/issues/detail?id=18)
Expand Down
28 changes: 16 additions & 12 deletions accessors-smart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.minidev</groupId>
<artifactId>accessors-smart</artifactId>
<version>1.2-SNAPSHOT</version>
<version>2.3.1</version>
<name>ASM based accessors helper used by json-smart</name>
<description>Java reflect give poor performance on getter setter an constructor calls, accessors-smart use ASM to speed up those calls.
</description>
<packaging>bundle</packaging>
<url>http://www.minidev.net/</url>
<url>https://urielch.github.io/</url>
<organization>
<name>Chemouni Uriel</name>
<url>http://www.minidev.net/</url>
<url>https://urielch.github.io/</url>
</organization>
<developers>
<developer>
<id>uriel</id>
<name>Uriel Chemouni</name>
<email>[email protected]</email>
<timezone>GMT-7</timezone>
<timezone>GMT+3</timezone>
<roles>
</roles>
</developer>
Expand All @@ -33,8 +33,8 @@
</licenses>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
Expand All @@ -51,7 +51,7 @@
</dependencies>

<!-- updated on 29/10/2015 -->
<!--
<!--
<reporting>
<plugins>
<plugin>
Expand Down Expand Up @@ -92,7 +92,11 @@
</property>
</activation>
<properties>
<gpg.keyname>8E322ED0</gpg.keyname>
<!-- My old Is back -->
<!-- <gpg.keyname>2C8DF6EC</gpg.keyname> -->
<!-- 2021 rsa4096 key-->
<gpg.keyname>53BE126D</gpg.keyname>
<!-- <gpg.keyname>8E322ED0</gpg.keyname> -->
<!-- <gpg.keyname>Uriel Chemouni (dev) <[email protected]></gpg.keyname> -->
<!-- GPG Key ID to use for signing -->
</properties>
Expand Down Expand Up @@ -196,8 +200,8 @@
<version>3.3</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
<target>1.6</target>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<excludes>
<exclude>**/.svn/*</exclude>
<exclude>**/.svn</exclude>
Expand Down Expand Up @@ -229,7 +233,7 @@
<!-- updated on 29/07/2015 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>2.10.4</version>
<!-- ONLY NEEDED With jdk 1.7+ -->
<configuration>
<failOnError>false</failOnError>
Expand All @@ -247,7 +251,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.3.0</version> <!-- 3.0.0 need java 7+ -->
<version>3.5.1</version> <!-- 3.0.0 need java 7+ -->
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
26 changes: 14 additions & 12 deletions json-smart-action/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
<parent>
<groupId>net.minidev</groupId>
<artifactId>minidev-parent</artifactId>
<version>2.3-SNAPSHOT</version>
<version>2.3.1</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>json-smart-action</artifactId>
<name>JSON Small and Fast Parser</name>
<name>JSON-smart-action Small and Fast Parser</name>
<description>
JSON (JavaScript Object Notation) is a lightweight data-interchange format. It is easy for humans to read and write. It is easy for machines to parse and generate. It is based on a subset of the JavaScript Programming Language, Standard ECMA-262 3rd Edition - December 1999. JSON is a text format that is completely language independent but uses conventions that are familiar to programmers of the C-family of languages, including C, C++, C#, Java, JavaScript, Perl, Python, and many others. These properties make JSON an ideal data-interchange language.
</description>
<packaging>bundle</packaging>
<url>http://www.minidev.net/</url>
<url>https://urielch.github.io/</url>
<organization>
<name>Chemouni Uriel</name>
<url>http://www.minidev.net/</url>
<url>https://urielch.github.io/</url>
</organization>
<developers>
<developer>
<id>uriel</id>
<name>Uriel Chemouni</name>
<email>[email protected]</email>
<timezone>GMT-7</timezone>
<timezone>GMT+3</timezone>
<roles>
</roles>
</developer>
Expand All @@ -43,8 +43,8 @@
</licenses>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -85,7 +85,9 @@
</activation>
<properties>
<!-- My old Is back -->
<gpg.keyname>2C8DF6EC</gpg.keyname>
<!-- <gpg.keyname>2C8DF6EC</gpg.keyname> -->
<!-- 2021 rsa4096 key-->
<gpg.keyname>53BE126D</gpg.keyname>
<!-- <gpg.keyname>8E322ED0</gpg.keyname> -->
<!-- <gpg.keyname>Uriel Chemouni (dev) <[email protected]></gpg.keyname> -->
<!-- GPG Key ID to use for signing -->
Expand Down Expand Up @@ -190,8 +192,8 @@
<version>3.3</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
<target>1.6</target>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<excludes>
<exclude>**/.svn/*</exclude>
<exclude>**/.svn</exclude>
Expand Down Expand Up @@ -223,7 +225,7 @@
<!-- updated on 29/07/2015 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>2.10.4</version>
<!-- ONLY NEEDED With jdk 1.7+ -->
<configuration>
<failOnError>false</failOnError>
Expand All @@ -241,7 +243,7 @@
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.0.0</version>
<version>3.5.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
49 changes: 27 additions & 22 deletions json-smart/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<parent>
<groupId>net.minidev</groupId>
<artifactId>minidev-parent</artifactId>
<version>2.3-SNAPSHOT</version>
<version>2.3.1</version>
</parent>
<!-- this POM is released under an Apache 2.0 license -->
<modelVersion>4.0.0</modelVersion>
Expand All @@ -13,17 +13,17 @@
JSON (JavaScript Object Notation) is a lightweight data-interchange format. It is easy for humans to read and write. It is easy for machines to parse and generate. It is based on a subset of the JavaScript Programming Language, Standard ECMA-262 3rd Edition - December 1999. JSON is a text format that is completely language independent but uses conventions that are familiar to programmers of the C-family of languages, including C, C++, C#, Java, JavaScript, Perl, Python, and many others. These properties make JSON an ideal data-interchange language.
</description>
<packaging>bundle</packaging>
<url>http://www.minidev.net/</url>
<url>https://urielch.github.io/</url>
<organization>
<name>Chemouni Uriel</name>
<url>http://www.minidev.net/</url>
<url>https://urielch.github.io/</url>
</organization>
<developers>
<developer>
<id>uriel</id>
<name>Uriel Chemouni</name>
<email>[email protected]</email>
<timezone>GMT-7</timezone>
<timezone>GMT+3</timezone>
<roles>
</roles>
</developer>
Expand All @@ -44,8 +44,8 @@
</licenses>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.compiler.source>1.5</maven.compiler.source>
<maven.compiler.target>1.5</maven.compiler.target>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
</properties>
<dependencies>
<dependency>
Expand All @@ -56,7 +56,7 @@
<dependency>
<groupId>net.minidev</groupId>
<artifactId>accessors-smart</artifactId>
<version>1.2-SNAPSHOT</version>
<version>2.3.1</version>
</dependency>
</dependencies>
<scm>
Expand Down Expand Up @@ -87,7 +87,9 @@
</activation>
<properties>
<!-- My old Is back -->
<gpg.keyname>2C8DF6EC</gpg.keyname>
<!-- <gpg.keyname>2C8DF6EC</gpg.keyname> -->
<!-- 2021 rsa4096 key-->
<gpg.keyname>53BE126D</gpg.keyname>
<!-- <gpg.keyname>8E322ED0</gpg.keyname> -->
<!-- <gpg.keyname>Uriel Chemouni (dev) <[email protected]></gpg.keyname> -->
<!-- GPG Key ID to use for signing -->
Expand Down Expand Up @@ -122,8 +124,10 @@
</plugin>
<!-- Publish also javadocs when releasing - required by Sonatype -->
<plugin>
<!-- updated on 17/04/2021 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>3.2.0</version>
<executions>
<execution>
<id>attach-javadocs</id>
Expand All @@ -140,7 +144,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>2.5.2</version>
<version>2.5.3</version>
<configuration>
<mavenExecutorId>forked-path</mavenExecutorId>
<arguments>-Psonatype-oss-release</arguments>
Expand Down Expand Up @@ -172,10 +176,10 @@
<build>
<plugins>
<plugin>
<!-- updated on 29/07/2015 -->
<!-- updated on 17/04/2021 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<version>2.4</version>
<version>3.2.1</version>
<executions>
<execution>
<id>bind-sources</id>
Expand All @@ -186,34 +190,34 @@
</executions>
</plugin>
<plugin>
<!-- updated on 29/10/2015 -->
<!-- updated on 17/04/2021 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.3</version>
<version>3.8.1</version>
<configuration>
<encoding>UTF-8</encoding>
<source>1.6</source>
<target>1.6</target>
<source>${maven.compiler.source}</source>
<target>${maven.compiler.target}</target>
<excludes>
<exclude>**/.svn/*</exclude>
<exclude>**/.svn</exclude>
</excludes>
</configuration>
</plugin>
<plugin>
<!-- updated on 29/10/2015 -->
<!-- updated on 17/04/2021 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
<version>2.7</version>
<version>3.2.0</version>
<configuration>
<encoding>UTF-8</encoding>
</configuration>
</plugin>
<plugin>
<!-- updated on 29/10/2015 -->
<!-- updated on 17/04/2021 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.6</version>
<version>3.2.0</version>
<configuration>
<excludes>
<exclude>**/.svn/*</exclude>
Expand All @@ -222,10 +226,10 @@
</configuration>
</plugin>
<plugin>
<!-- updated on 29/07/2015 -->
<!-- updated on 17/04/2021 -->
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.3</version>
<version>3.2.0</version>
<!-- ONLY NEEDED With jdk 1.7+ -->
<configuration>
<failOnError>false</failOnError>
Expand All @@ -241,9 +245,10 @@
</executions>
</plugin>
<plugin>
<!-- updated on 17/04/2021 -->
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<version>3.3.0</version> <!-- 3.0.0 need java 7+ -->
<version>5.1.2</version> <!-- 3.0.0 need java 7+ -->
<extensions>true</extensions>
<configuration>
<instructions>
Expand Down
14 changes: 9 additions & 5 deletions json-smart/src/main/java/net/minidev/json/parser/JSONParserBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,15 @@ public void checkLeadinZero() throws ParseException {
protected Number extractFloat() throws ParseException {
if (!acceptLeadinZero)
checkLeadinZero();
if (!useHiPrecisionFloat)
return Float.parseFloat(xs);
if (xs.length() > 18) // follow JSonIJ parsing method
return new BigDecimal(xs);
return Double.parseDouble(xs);
try {
if (!useHiPrecisionFloat)
return Float.parseFloat(xs);
if (xs.length() > 18) // follow JSonIJ parsing method
return new BigDecimal(xs);
return Double.parseDouble(xs);
} catch (NumberFormatException e) {
throw new ParseException(pos, ERROR_UNEXPECTED_TOKEN, xs);
}
}

/**
Expand Down
Loading