Skip to content

Fix StringIndexOutOfBoundsException for a lone quote field in DelimitedLineTokenizer #5522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hunseonglee wants to merge 1 commit into from
Closed

Fix StringIndexOutOfBoundsException for a lone quote field in DelimitedLineTokenizer #5522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .../org/springframework/batch/infrastructure/item/file/transform/DelimitedLineTokenizer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2023 the original author or authors.
* Copyright 2006-2026 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -218,8 +218,7 @@ private String substringWithTrimmedWhitespaceAndQuotesIfQuotesPresent(String lin

String value;

if ((line.length() >= 2) && isQuoteCharacter(line.charAt(start))
&& isQuoteCharacter(line.charAt(start + len - 1))) {
if ((len >= 2) && isQuoteCharacter(line.charAt(start)) && isQuoteCharacter(line.charAt(start + len - 1))) {
int beginIndex = start + 1;
int endIndex = len - 2;
value = line.substring(beginIndex, beginIndex + endIndex);
Expand Down
17 changes: 16 additions & 1 deletion ...springframework/batch/infrastructure/item/file/transform/DelimitedLineTokenizerTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright 2006-2023 the original author or authors.
* Copyright 2006-2026 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -245,6 +245,21 @@ void testTokenizeWithUnclosedQuotes() {
assertEquals("c", line.readString(2));
}

@Test
void testTokenizeWithLoneQuoteCharacterField() {
FieldSet line = tokenizer.tokenize("a,\"");
assertEquals(2, line.getFieldCount());
assertEquals("a", line.readString(0));
assertEquals("\"", line.readString(1));
}

@Test
void testTokenizeWithLoneQuoteCharacterLine() {
FieldSet line = tokenizer.tokenize("\"");
assertEquals(1, line.getFieldCount());
assertEquals("\"", line.readString(0));
}

@Test
void testTokenizeWithSpaceInField() {
FieldSet line = tokenizer.tokenize("a,b ,c");
Expand Down