Skip to content

return null for malformed input in UrlDecoderStringLookup #749

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

Open
dxbjavid wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −0
Open

return null for malformed input in UrlDecoderStringLookup #749

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
3 changes: 3 additions & 0 deletions src/main/java/org/apache/commons/text/lookup/UrlDecoderStringLookup.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,9 @@ public String lookup(final String key) {
final String enc = StandardCharsets.UTF_8.name();
try {
return decode(key, enc);
} catch (final IllegalArgumentException e) {
// Malformed input such as an incomplete "%" escape; squelch and return null like the other lookups.
return null;
} catch (final UnsupportedEncodingException e) {
// Can't happen since UTF-8 is required by the Java specification.
throw IllegalArgumentExceptions.format(e, "%s: source=%s, encoding=%s", e, key, enc);
Expand Down
6 changes: 6 additions & 0 deletions src/test/java/org/apache/commons/text/lookup/UrlDecoderStringLookupTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@ void testExclamation() {
assertEquals(DATA, UrlDecoderStringLookup.INSTANCE.apply("Hello%20World!"));
}

@Test
void testMalformedEscapeReturnsNull() {
assertNull(UrlDecoderStringLookup.INSTANCE.apply("%"));
assertNull(UrlDecoderStringLookup.INSTANCE.apply("%E0%"));
}

@Test
void testNull() {
assertNull(UrlDecoderStringLookup.INSTANCE.apply(null));
Expand Down