stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8316879: RegionMatches1Tests fails if CompactStrings are disabled after JDK-8302163

Browse Source 
Reviewed-by: simonis, rgiulietti, rriggs
This commit is contained in:
Aleksei Voitylov 2023-09-28 18:11:40 +00:00 committed by Roger Riggs
parent ca5eee2fe3
commit cfcbfc6cae
2 changed files with 28 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/java.base/share/classes/java/lang/String.java
View File

@ -2156,6 +2156,10 @@ public final class String
(ooffset > (long)other.length() - len)) {
return false;
}
// Any strings match if len <= 0
if (len <= 0) {
return true;
}
byte[] tv = value;
byte[] ov = other.value;
byte coder = coder();

32
test/jdk/java/lang/String/RegionMatches.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1998, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1998, 2023, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -23,18 +23,34 @@
/**
* @test
* @bug 4016509
* @summary test regionMatches corner case
* @bug 4016509 8316879
* @summary test regionMatches corner cases
* @run junit RegionMatches
*/
import java.io.UnsupportedEncodingException;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class RegionMatches {
public static void main (String args[]) throws Exception {
String s1="abc";
String s2="def";
private final String s1_LATIN1 = "abc";
private final String s2_LATIN1 = "def";
if (!s1.regionMatches(0,s2,0,Integer.MIN_VALUE))
throw new RuntimeException("Integer overflow in RegionMatches");
private final String s1_UTF16 = "\u041e\u0434\u043d\u0430\u0436\u0434\u044b";
private final String s2_UTF16 = "\u0432\u0441\u0442\u0443\u0434\u0435\u043d";
@Test
public void TestLATIN1() {
// Test for 4016509
boolean result = s1_LATIN1.regionMatches(0, s2_LATIN1, 0, Integer.MIN_VALUE);
assertTrue(result, "Integer overflow in RegionMatches when comparing LATIN1 strings");
}
@Test
public void TestUTF16() throws UnsupportedEncodingException{
// Test for 8316879
boolean result = s1_UTF16.regionMatches(0, s2_UTF16, 0, Integer.MIN_VALUE + 1);
assertTrue(result, "Integer overflow in RegionMatches when comparing UTF16 strings");
}
}