[JENKINS-47909] Handle false hex escapes.

jenkinsci · Nov 9, 2017 · b675122 · b675122
1 parent 397b4fa
commit b675122
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/core/src/main/java/jenkins/model/IdStrategy.java b/core/src/main/java/jenkins/model/IdStrategy.java
@@ -303,7 +303,11 @@ public String idFromFilename(@Nonnull String filename) {
                         } else {
                             break;
                         }
-                        buf.append(Character.valueOf((char)Integer.parseInt(hex.toString(), 16)));
+                        try {
+                            buf.append(Character.valueOf((char)Integer.parseInt(hex.toString(), 16)));
+                        } catch (NumberFormatException x) {
+                            buf.append('$').append(hex);
+                        }
                     }
                 }
                 return buf.toString();
@@ -509,7 +513,11 @@ public String idFromFilename(@Nonnull String filename) {
                         } else {
                             break;
                         }
-                        buf.append(Character.valueOf((char)Integer.parseInt(hex.toString(), 16)));
+                        try {
+                            buf.append(Character.valueOf((char)Integer.parseInt(hex.toString(), 16)));
+                        } catch (NumberFormatException x) {
+                            buf.append('$').append(hex);
+                        }
                     }
                 }
                 return buf.toString();

diff --git a/core/src/test/java/jenkins/model/IdStrategyTest.java b/core/src/test/java/jenkins/model/IdStrategyTest.java
@@ -29,6 +29,7 @@ public void caseInsensitive() {
         assertCaseInsensitiveRoundTrip("NUL", "$006eul");
         assertEquals("foo", idStrategy.idFromFilename("~foo"));
         assertEquals("0123 _-@a", idStrategy.idFromFilename("0123 _-@~a"));
+        assertEquals("big$money", idStrategy.idFromFilename("big$money"));
     }
 
     @Test