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

8319640: ClassicFormat::parseObject (from DateTimeFormatter) does not conform to the javadoc and may leak DateTimeException

Browse Source 
Reviewed-by: rriggs, iris, jlu, joehw
This commit is contained in:
Naoto Sato 2023-11-13 23:42:40 +00:00
parent 1802cb566e
commit fe0ccdf5f8
2 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/java.base/share/classes/java/time/format/DateTimeFormatter.java
View File

@ -2296,29 +2296,23 @@ public final class DateTimeFormatter {
DateTimeParseContext context; DateTimeParseContext context;
try { try {
context = formatter.parseUnresolved0(text, pos); context = formatter.parseUnresolved0(text, pos);
} catch (IndexOutOfBoundsException ex) { if (context == null) {
if (pos.getErrorIndex() < 0) { if (pos.getErrorIndex() < 0) {
pos.setErrorIndex(0); pos.setErrorIndex(0);
}
return null;
} }
return null;
}
if (context == null) {
if (pos.getErrorIndex() < 0) {
pos.setErrorIndex(0);
}
return null;
}
try {
TemporalAccessor resolved = context.toResolved(formatter.resolverStyle, formatter.resolverFields); TemporalAccessor resolved = context.toResolved(formatter.resolverStyle, formatter.resolverFields);
if (parseType == null) { if (parseType == null) {
return resolved; return resolved;
} }
return resolved.query(parseType); return resolved.query(parseType);
} catch (RuntimeException ex) { } catch (RuntimeException ex) {
pos.setErrorIndex(0); if (pos.getErrorIndex() < 0) {
pos.setErrorIndex(0);
}
return null; return null;
} }
} }
} }
} }

36
test/jdk/java/time/test/java/time/format/TestDateTimeParsing.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2014, 2023, 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
@ -62,15 +62,19 @@ package test.java.time.format;
import static java.time.temporal.ChronoField.AMPM_OF_DAY; import static java.time.temporal.ChronoField.AMPM_OF_DAY;
import static java.time.temporal.ChronoField.EPOCH_DAY; import static java.time.temporal.ChronoField.EPOCH_DAY;
import static java.time.temporal.ChronoField.HOUR_OF_AMPM; import static java.time.temporal.ChronoField.HOUR_OF_AMPM;
import static java.time.temporal.ChronoField.HOUR_OF_DAY;
import static java.time.temporal.ChronoField.INSTANT_SECONDS; import static java.time.temporal.ChronoField.INSTANT_SECONDS;
import static java.time.temporal.ChronoField.MICRO_OF_SECOND; import static java.time.temporal.ChronoField.MICRO_OF_SECOND;
import static java.time.temporal.ChronoField.MILLI_OF_SECOND; import static java.time.temporal.ChronoField.MILLI_OF_SECOND;
import static java.time.temporal.ChronoField.MINUTE_OF_HOUR;
import static java.time.temporal.ChronoField.NANO_OF_SECOND; import static java.time.temporal.ChronoField.NANO_OF_SECOND;
import static java.time.temporal.ChronoField.OFFSET_SECONDS; import static java.time.temporal.ChronoField.OFFSET_SECONDS;
import static java.time.temporal.ChronoField.SECOND_OF_DAY; import static java.time.temporal.ChronoField.SECOND_OF_DAY;
import static java.util.Locale.US; import static java.util.Locale.US;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertNull;
import java.text.ParsePosition;
import java.time.DateTimeException; import java.time.DateTimeException;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
@ -80,7 +84,9 @@ import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeFormatterBuilder; import java.time.format.DateTimeFormatterBuilder;
import java.time.format.DateTimeParseException; import java.time.format.DateTimeParseException;
import java.time.format.SignStyle;
import java.time.temporal.TemporalAccessor; import java.time.temporal.TemporalAccessor;
import java.util.Locale;
import org.testng.annotations.DataProvider; import org.testng.annotations.DataProvider;
import org.testng.annotations.Test; import org.testng.annotations.Test;
@ -88,7 +94,7 @@ import org.testng.annotations.Test;
/** /**
* @test * @test
* @summary Test parsing of edge cases. * @summary Test parsing of edge cases.
* @bug 8223773 8272473 * @bug 8223773 8272473 8319640
*/ */
public class TestDateTimeParsing { public class TestDateTimeParsing {
@ -237,4 +243,30 @@ public class TestDateTimeParsing {
} }
} }
} }
// Checks ::toFormat().parseObject(text, pos) do not throw DateTimeException
@Test
public void test_toFormat_2arg_null_return_on_DateTimeException() {
var f = new DateTimeFormatterBuilder()
.appendValue(HOUR_OF_DAY, 2, 2, SignStyle.NOT_NEGATIVE)
.optionalStart()
.appendLiteral(':')
.appendValue(MINUTE_OF_HOUR, 2, 2, SignStyle.NOT_NEGATIVE)
.optionalEnd()
.optionalStart()
.appendOffset("+HHmm", "Z")
.optionalEnd()
.toFormatter(Locale.ROOT)
.toFormat();
assertNull(f.parseObject("17-30", new ParsePosition(0)));
}
// Checks ::toFormat().parseObject(text, pos) do not throw IOOBE
@Test
public void test_toFormat_2arg_null_return_on_IOOBE() {
var date = "2023-11-13";
assertNull(DateTimeFormatter.ISO_LOCAL_DATE
.toFormat()
.parseObject(date, new ParsePosition(date.length() + 1)));
}
} }