archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 14:54:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8224240: Properties.load fails to throw IAE on malformed unicode in certain circumstances

Browse source 
Reviewed-by: smarks, rriggs, dfuchs
This commit is contained in:
Claes Redestad 2019-06-05 10:23:06 +02:00
parent a2f40ec3e1
commit 27d8c3f7b4
2 changed files with 25 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/java.base/share/classes/java/util/Properties.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 1995, 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 1995, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -641,11 +641,16 @@ class Properties extends Hashtable<Object,Object> {
while (off < end) { while (off < end) {
aChar = in[off++]; aChar = in[off++];
if (aChar == '\\') { if (aChar == '\\') {
// No need to bounds check since LineReader::readLine excludes
// unescaped \s at the end of the line
aChar = in[off++]; aChar = in[off++];
if(aChar == 'u') { if(aChar == 'u') {
// Read the xxxx // Read the xxxx
int value=0; if (off > end - 4)
for (int i=0; i<4; i++) { throw new IllegalArgumentException(
"Malformed \\uxxxx encoding.");
int value = 0;
for (int i = 0; i < 4; i++) {
aChar = in[off++]; aChar = in[off++];
switch (aChar) { switch (aChar) {
case '0': case '1': case '2': case '3': case '4': case '0': case '1': case '2': case '3': case '4':

20
test/jdk/java/util/Properties/PropertiesTest.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2018, 2019, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -25,7 +25,7 @@
* @test * @test
* @summary tests the load and store methods of Properties class * @summary tests the load and store methods of Properties class
* @author Xueming Shen * @author Xueming Shen
* @bug 4094886 * @bug 4094886 8224202
* @modules jdk.charsets * @modules jdk.charsets
* @key randomness * @key randomness
*/ */
@ -411,9 +411,23 @@ public class PropertiesTest {
} }
private static void UnicodeEscape() throws Exception { private static void UnicodeEscape() throws Exception {
checkMalformedUnicodeEscape("b=\\u012\n");
checkMalformedUnicodeEscape("b=\\u01\n");
checkMalformedUnicodeEscape("b=\\u0\n");
checkMalformedUnicodeEscape("b=\\u\n");
checkMalformedUnicodeEscape("a=\\u0123\nb=\\u012\n");
checkMalformedUnicodeEscape("a=\\u0123\nb=\\u01\n");
checkMalformedUnicodeEscape("a=\\u0123\nb=\\u0\n");
checkMalformedUnicodeEscape("a=\\u0123\nb=\\u\n");
checkMalformedUnicodeEscape("b=\\u012xyz\n");
checkMalformedUnicodeEscape("b=x\\u012yz\n");
checkMalformedUnicodeEscape("b=xyz\\u012\n");
}
private static void checkMalformedUnicodeEscape(String propString) throws Exception {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
OutputStreamWriter osw = new OutputStreamWriter(baos); OutputStreamWriter osw = new OutputStreamWriter(baos);
osw.write("a=b\nb=\\u0\n"); osw.write(propString);
osw.close(); osw.close();
Properties props = new Properties(); Properties props = new Properties();
boolean failed = true; boolean failed = true;