zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly
2023-09-01 23:41:00 +08:00
parent 56abd26590
commit 645ee387d3
6 changed files with 45 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
hutool-json/src/main/java/org/dromara/hutool/json/JSONArray.java
View File

@@ -15,6 +15,7 @@ package org.dromara.hutool.json;
import org.dromara.hutool.core.collection.CollUtil;
import org.dromara.hutool.core.convert.Convert;
import org.dromara.hutool.core.convert.impl.ArrayConverter;
import org.dromara.hutool.core.lang.Validator;
import org.dromara.hutool.core.lang.mutable.Mutable;
import org.dromara.hutool.core.lang.mutable.MutableEntry;
import org.dromara.hutool.core.lang.mutable.MutableObj;
@@ -25,12 +26,7 @@ import org.dromara.hutool.json.writer.JSONWriter;
import java.io.StringWriter;
import java.io.Writer;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.RandomAccess;
import java.util.*;
import java.util.function.Predicate;
/**
@@ -456,7 +452,15 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
}
this.rawList.add(index, InternalJSONUtil.wrap(element, this.config));
} else {
// 相对于5.x逻辑变更，当index大于size，则追加，而不是补充null，这样更加安全
// issue#3286, 如果用户指定的index太大，容易造成Java heap space错误。
if (!config.isIgnoreNullValue()) {
// issue#3286, 增加安全检查，最多增加10倍
Validator.checkIndexLimit(index, this.size());
while (index != this.size()) {
// 非末尾，则填充null
this.add(null);
}
}
this.add(element);
}

4
hutool-json/src/test/java/org/dromara/hutool/json/JSONArrayTest.java
View File

@@ -225,9 +225,9 @@ public class JSONArrayTest {
Assertions.assertEquals(1, jsonArray.size());
jsonArray = new JSONArray(JSONConfig.of().setIgnoreNullValue(false));
jsonArray.set(3, "test");
jsonArray.set(2, "test");
// 第三个位置插入值，0~2都是null
Assertions.assertEquals(4, jsonArray.size());
Assertions.assertEquals(3, jsonArray.size());
}
// https://github.com/dromara/hutool/issues/1858