Apache
/
commons-lang
mirror of https://github.com/apache/commons-lang.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

LANG-832 FastDateParser does not handle unterminated quotes correctly 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1390795 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2012-09-27 00:55:31 +00:00
parent ad72b9f2bf
commit 65a6458eaa
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/changes/changes.xml
View File

@ -22,6 +22,7 @@
<body> <body>
<release version="3.2" date="TBA" description="Next release"> <release version="3.2" date="TBA" description="Next release">
<action issue="LANG-832" type="fix">FastDateParser does not handle unterminated quotes correctly</action>
<action issue="LANG-831" type="fix">FastDateParser does not handle white-space properly</action> <action issue="LANG-831" type="fix">FastDateParser does not handle white-space properly</action>
<action issue="LANG-828" type="fix">FastDateParser does not handle non-Gregorian calendars properly</action> <action issue="LANG-828" type="fix">FastDateParser does not handle non-Gregorian calendars properly</action>
<action issue="LANG-826" type="fix">FastDateParser does not handle non-ASCII digits correctly</action> <action issue="LANG-826" type="fix">FastDateParser does not handle non-ASCII digits correctly</action>

3
src/main/java/org/apache/commons/lang3/time/FastDateParser.java
View File

@ -141,6 +141,9 @@ public class FastDateParser implements DateParser, Serializable {
currentFormatField= nextFormatField; currentFormatField= nextFormatField;
currentStrategy= nextStrategy; currentStrategy= nextStrategy;
} }
if (patternMatcher.regionStart() != patternMatcher.regionEnd()) {
throw new IllegalArgumentException("Failed to parse \""+pattern+"\" ; gave up at index "+patternMatcher.regionStart());
}
if(currentStrategy.addRegex(this, regex)) { if(currentStrategy.addRegex(this, regex)) {
collector.add(currentStrategy); collector.add(currentStrategy);
} }

5
src/test/java/org/apache/commons/lang3/time/FastDateParserTest.java
View File

@ -333,6 +333,11 @@ public class FastDateParserTest {
assertEquals(cal.getTime(), fdf.parse("'20030210A'B153320989'")); assertEquals(cal.getTime(), fdf.parse("'20030210A'B153320989'"));
} }
@Test
public void testLANG_832() throws Exception {
testSdfAndFdp("'d'd" ,"d3", false); // OK
testSdfAndFdp("'d'd'","d3", true); // should fail (unterminated quote)
}
@Test @Test
public void testLANG_831() throws Exception { public void testLANG_831() throws Exception {