Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix string handling to avoid exceptions when doing path extraction

Browse Source 
Issue: SPR-15259
This commit is contained in:
Andy Clement
2017-02-15 16:36:09 -08:00
parent 51f2042e97
commit f98ea11e5e
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-web/src/main/java/org/springframework/web/util/patterns/PathPattern.java
View File

@@ -232,7 +232,7 @@ public class PathPattern implements Comparable<PathPattern> {
while (separatorCount > 0 && pos < len) {
if (path.charAt(pos++) == separator) {
// Skip any adjacent separators
while (path.charAt(pos) == separator) {
while (pos < len && path.charAt(pos) == separator) {
pos++;
}
separatorCount--;
@@ -240,7 +240,7 @@ public class PathPattern implements Comparable<PathPattern> {
}
int end = len;
// Trim trailing separators
while (path.charAt(end - 1) == separator) {
while (end > 0 && path.charAt(end - 1) == separator) {
end--;
}
// Check if multiple separators embedded in the resulting path, if so trim them out.

8
spring-web/src/test/java/org/springframework/web/util/patterns/PathPatternMatcherTests.java
View File

@@ -467,6 +467,14 @@ public class PathPatternMatcherTests {
}
}
@Test
public void extractPathWithinPattern_spr15259() {
checkExtractPathWithinPattern("/**","/","");
checkExtractPathWithinPattern("/**","//","");
checkExtractPathWithinPattern("/**","","");
checkExtractPathWithinPattern("/**","/foobar","foobar");
}
@Test
public void extractPathWithinPattern() throws Exception {
checkExtractPathWithinPattern("/welcome*/", "/welcome/", "welcome");