root
/
fastjson2
mirror of https://github.com/alibaba/fastjson2.git
1
0
Fork 0
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix #3636
Java CI / Test on JDK ${{ matrix.java }} OS ${{ matrix.os }} (11, ubuntu-20.04) (push) Has been cancelled Details
Java CI / Test on JDK ${{ matrix.java }} OS ${{ matrix.os }} (17, ubuntu-20.04) (push) Has been cancelled Details
Java CI / Test on JDK ${{ matrix.java }} OS ${{ matrix.os }} (8, ubuntu-20.04) (push) Has been cancelled Details

This commit is contained in:
高铁 2025-07-16 14:02:29 +08:00
parent 69afb257ef
commit f77e073fa2
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/main/java/com/alibaba/fastjson2/JSONReaderASCII.java
View File

@ -80,7 +80,10 @@ final class JSONReaderASCII
if (offset < end && bytes[offset] == first) { if (offset < end && bytes[offset] == first) {
offset++; offset++;
} else if (offset + 4 < end } else if (offset + 4 < end
&& IOUtils.isNULL(bytes, offset) && bytes[offset] == 'n'
&& bytes[offset + 1] == 'u'
&& bytes[offset + 2] == 'l'
&& bytes[offset + 3] == 'l'
&& bytes[offset + 4] == first && bytes[offset + 4] == first
) { ) {
offset += 5; offset += 5;

13
core/src/main/java/com/alibaba/fastjson2/JSONReaderUTF8.java
View File

@ -3359,7 +3359,13 @@ class JSONReaderUTF8
boolValue = true; boolValue = true;
valueType = JSON_TYPE_BOOL; valueType = JSON_TYPE_BOOL;
ch = offset == end ? EOI : bytes[offset++]; ch = offset == end ? EOI : bytes[offset++];
} else if (ch == 'f' && offset + 3 < end && IOUtils.isALSE(bytes, offset)) { } else if (ch == 'f'
&& offset + 3 < end
&& bytes[offset] == 'a'
&& bytes[offset + 1] == 'l'
&& bytes[offset + 2] == 's'
&& bytes[offset + 3] == 'e'
) {
valid = true; valid = true;
offset += 4; offset += 4;
boolValue = false; boolValue = false;
@ -4469,7 +4475,10 @@ class JSONReaderUTF8
if (offset < end && bytes[offset] == first) { if (offset < end && bytes[offset] == first) {
offset++; offset++;
} else if (offset + 4 < end } else if (offset + 4 < end
&& IOUtils.isNULL(bytes, offset) && bytes[offset] == 'n'
&& bytes[offset + 1] == 'u'
&& bytes[offset + 2] == 'l'
&& bytes[offset + 3] == 'l'
&& bytes[offset + 4] == first && bytes[offset + 4] == first
) { ) {
offset += 5; offset += 5;

4
core/src/main/java/com/alibaba/fastjson2/util/IOUtils.java
View File

@ -1194,10 +1194,6 @@ public class IOUtils {
return (d & 0xF) * 10 + (d >> 16); return (d & 0xF) * 10 + (d >> 16);
} }
public static boolean isNULL(byte[] buf, int pos) {
return UNSAFE.getInt(buf, ARRAY_BYTE_BASE_OFFSET + pos) == NULL_32;
}
public static boolean isALSE(byte[] buf, int pos) { public static boolean isALSE(byte[] buf, int pos) {
return UNSAFE.getInt(buf, ARRAY_BYTE_BASE_OFFSET + pos) == ALSE; return UNSAFE.getInt(buf, ARRAY_BYTE_BASE_OFFSET + pos) == ALSE;
} }