archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 06:45:07 +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.
*
* 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) {
aChar = in[off++];
if (aChar == '\\') {
// No need to bounds check since LineReader::readLine excludes
// unescaped \s at the end of the line
aChar = in[off++];
if(aChar == 'u') {
// Read the xxxx
int value=0;
for (int i=0; i<4; i++) {
if (off > end - 4)
throw new IllegalArgumentException(
"Malformed \\uxxxx encoding.");
int value = 0;
for (int i = 0; i < 4; i++) {
aChar = in[off++];
switch (aChar) {
case '0': case '1': case '2': case '3': case '4':