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

修复ArrayUtil.lastIndexOfSub死循环问题

Browse Source
This commit is contained in:
Looly
2024-09-09 21:25:28 +08:00
parent bba5906118
commit d12fcab0e8
3 changed files with 65 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
hutool-core/src/main/java/cn/hutool/core/util/ArrayUtil.java
View File

@@ -6,10 +6,7 @@ import cn.hutool.core.collection.UniqueKeySet;
import cn.hutool.core.comparator.CompareUtil;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.exceptions.UtilException;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.Editor;
import cn.hutool.core.lang.Filter;
import cn.hutool.core.lang.Matcher;
import cn.hutool.core.lang.*;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.text.StrJoiner;
@@ -1864,29 +1861,49 @@ public class ArrayUtil extends PrimitiveArrayUtil {
* 查找最后一个子数组的开始位置
*
* @param array 数组
* @param endInclude 查找结束的位置（包含）
* @param endInclude 查找结束的位置（包含），-1表示最后一位
* @param subArray 子数组
* @param <T> 数组元素类型
* @return 最后一个子数组的开始位置，即子数字第一个元素在数组中的位置
* @since 5.4.8
*/
public static <T> int lastIndexOfSub(T[] array, int endInclude, T[] subArray) {
if (isEmpty(array) || isEmpty(subArray) || subArray.length > array.length || endInclude < 0) {
if (isEmpty(array) || isEmpty(subArray)) {
return INDEX_NOT_FOUND;
}
if(endInclude < 0){
endInclude += array.length;
}
if(endInclude < 0){
return INDEX_NOT_FOUND;
}
if(endInclude > array.length - 1){
// 结束位置超过最大值
endInclude = array.length - 1;
}
if(subArray.length - 1 > endInclude){
// 剩余长度不足
return INDEX_NOT_FOUND;
}
int firstIndex = lastIndexOf(array, subArray[0]);
if (firstIndex < 0 || firstIndex + subArray.length > array.length) {
final int lastEleIndex = lastIndexOf(array, subArray[subArray.length - 1], endInclude);
if (lastEleIndex < 0 || lastEleIndex < subArray.length - 1) {
return INDEX_NOT_FOUND;
}
for (int i = 0; i < subArray.length; i++) {
if (false == ObjectUtil.equal(array[i + firstIndex], subArray[i])) {
return lastIndexOfSub(array, firstIndex - 1, subArray);
// 匹配字串后续字符
boolean isAllMatch = true;
for (int i = 0; i < subArray.length - 1; i++) {
if (ObjectUtil.notEqual(array[i + lastEleIndex - subArray.length + 1], subArray[i])) {
isAllMatch =false;
break;
}
}
if(isAllMatch){
return lastEleIndex - subArray.length + 1;
}
return firstIndex;
return lastIndexOfSub(array, lastEleIndex - 1, subArray);
}
// O(n)时间复杂度检查数组是否有序

34
hutool-core/src/test/java/cn/hutool/core/util/IssueIAQ16ETest.java Normal file
View File

@@ -0,0 +1,34 @@
package cn.hutool.core.util;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
public class IssueIAQ16ETest {
@Test
void lastIndexOfSubTest() {
Integer[] bigBytes = new Integer[]{1, 2, 2, 2, 3, 2, 2, 2, 3};
Integer[] subBytes = new Integer[]{2, 2};
final int i = ArrayUtil.lastIndexOfSub(bigBytes, subBytes);
Assertions.assertEquals(6, i);
}
@Test
void lastIndexOfSubTest2() {
Integer[] bigBytes = new Integer[]{1, 2, 2, 2, 3, 2, 2, 2, 3, 4, 5};
Integer[] subBytes = new Integer[]{2, 2, 2, 3};
final int i = ArrayUtil.lastIndexOfSub(bigBytes, subBytes);
Assertions.assertEquals(5, i);
Assertions.assertEquals(5, i);
}
@Test
public void lastIndexOfSubTest3() {
Integer[] a = {0x12, 0x34, 0x56, 0x78, 0x9A};
Integer[] b = {0x56, 0x78};
int i = ArrayUtil.lastIndexOfSub(a, b);
assertEquals(2, i);
}
}