Skip to content

Improve UriComponents.sanitizeSource() #25401

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

Merged
merged 1 commit into from
Aug 10, 2020
Merged

Improve UriComponents.sanitizeSource() #25401

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
7 changes: 4 additions & 3 deletions spring-web/src/main/java/org/springframework/web/util/UriComponents.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,8 @@ static String expandUriComponent(@Nullable String source, UriTemplateVariables u
*/
private static String sanitizeSource(String source) {
int level = 0;
StringBuilder sb = new StringBuilder();
int lastCharIndex = 0;
char[] chars = new char[source.length()];
for (char c : source.toCharArray()) {
if (c == '{') {
level++;
Expand All @@ -287,9 +288,9 @@ private static String sanitizeSource(String source) {
if (level > 1 || (level == 1 && c == '}')) {
continue;
}
sb.append(c);
chars[lastCharIndex++] = c;
}
return sb.toString();
return new String(chars, 0, lastCharIndex);
}

private static String getVariableName(String match) {
Expand Down