Make parsing of version ranges more robust to fix issues with index o…

…ut of bounds
sse-labs · Jan 22, 2025 · bc9603d · bc9603d
1 parent 76d8e8a
commit bc9603d
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 14 deletions.
diff --git a/src/main/java/org/tudo/sse/resolution/PomResolver.java b/src/main/java/org/tudo/sse/resolution/PomResolver.java
@@ -782,20 +782,33 @@ public String resolveVersionRange(org.tudo.sse.model.pom.Dependency toResolve) {
     }
 
     private List<String> splitSets(String range) {
-        List<String> sets = new ArrayList<>();
+        List<String> ranges = new ArrayList<>();
         StringBuilder current = new StringBuilder();
-        int i = 0;
-        while(i < range.length()) {
-            while(i < range.length() && range.charAt(i) != ']' && range.charAt(i) != ')') {
-                current.append(range.charAt(i));
-                i++;
-            }
-             current.append(range.charAt(i));
-            i += 2;
-            sets.add(current.toString());
-            current = new StringBuilder();
-        }
-        return sets;
+        boolean isRangeOpen = false;
+
+        for(int i = 0; i < range.length(); i++){
+            switch(range.charAt(i)){
+                case '[':
+                case '(':
+                    isRangeOpen = true;
+                    current = new StringBuilder();
+                    current.append(range.charAt(i));
+                    break;
+                case ']':
+                case ')':
+                    current.append(range.charAt(i));
+                    isRangeOpen = false;
+                    ranges.add(current.toString());
+                    break;
+                default:
+                    // Keep anything inside a range (whitespaces, etc) as is, drop anything between ranges (commas, whitespaces)
+                    if(isRangeOpen)
+                        current.append(range.charAt(i));
+                    break;
+            }
+        }
+
+        return ranges;
     }
 
     private static boolean isVersionRange(String version) {

diff --git a/src/test/resources/PomInputs.json b/src/test/resources/PomInputs.json
@@ -362,7 +362,7 @@
       "org.springframework.boot:spring-boot-starter-web:2.5.0:compile",
       "com.fasterxml.jackson.core:jackson-databind:2.10.0:compile",
       "org.hibernate:hibernate-core:5.3.0.CR2:compile",
-      "com.google.guava:guava:33.3.1-jre:compile",
+      "com.google.guava:guava:33.4.0-jre:compile",
       "org.apache.httpcomponents:httpclient:4.5.13:compile",
       "commons-io:commons-io:2.18.0:compile"
     ]