Backups/JSON-java
1
0
Fork 0
mirror of https://github.com/stleary/JSON-java.git synced 2025-08-02 19:15:27 -04:00
Code Issues Projects Releases Wiki Activity

Merge pull request #740 from michael-o/proper-encoding

Browse Source 
JSONTokener(InputStream) violates rfc8259#section-8.1 (#739)
This commit is contained in:
Sean Leary 2023-05-28 14:11:41 -05:00 committed by GitHub
commit 22ccf1b8e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/org/json/JSONTokener.java
View File

@ -1,6 +1,7 @@
package org.json;
import java.io.*;
import java.nio.charset.Charset;
/*
Public Domain.
@ -56,7 +57,7 @@ public class JSONTokener {
* @param inputStream The source.
*/
public JSONTokener(InputStream inputStream) {
this(new InputStreamReader(inputStream));
this(new InputStreamReader(inputStream, Charset.forName("UTF-8")));
}
@ -120,7 +121,7 @@ public class JSONTokener {
/**
* Checks if the end of the input has been reached.
*
*
* @return true if at the end of the file and we didn't step back
*/
public boolean end() {
@ -184,7 +185,7 @@ public class JSONTokener {
this.previous = (char) c;
return this.previous;
}
/**
* Get the last character read from the input or '\0' if nothing has been read yet.
* @return the last character read from the input.