diff options
| author | Robin Rosenberg <robin.rosenberg@dewire.com> | 2014-08-21 17:47:51 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2014-08-21 17:47:51 -0400 |
| commit | 5797dbe9a789e5343f8a08f2571bbcddadb31a3d (patch) | |
| tree | 3a2a68b51cf6d3d090c7ac865363fc682286387a /org.eclipse.jgit/src/org/eclipse | |
| parent | 30953bbb679f776eb170ff846695ec851ca9ed26 (diff) | |
| parent | da6e72908647f8b1d702137564ef8b06582b37e4 (diff) | |
| download | jgit-5797dbe9a789e5343f8a08f2571bbcddadb31a3d.tar.gz jgit-5797dbe9a789e5343f8a08f2571bbcddadb31a3d.zip | |
Merge "Throw URISyntaxException for incorrect percent-encoding"
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java index aae898db81..91e212b478 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/URIish.java @@ -252,6 +252,11 @@ public class URIish implements Serializable { throw new URISyntaxException(s, JGitText.get().cannotParseGitURIish); } + private static int parseHexByte(byte c1, byte c2) { + return ((RawParseUtils.parseHexInt4(c1) << 4) + | RawParseUtils.parseHexInt4(c2)); + } + private static String unescape(String s) throws URISyntaxException { if (s == null) return null; @@ -272,8 +277,14 @@ public class URIish implements Serializable { if (c == '%') { if (i + 2 >= bytes.length) throw new URISyntaxException(s, JGitText.get().cannotParseGitURIish); - int val = (RawParseUtils.parseHexInt4(bytes[i + 1]) << 4) - | RawParseUtils.parseHexInt4(bytes[i + 2]); + byte c1 = bytes[i + 1]; + byte c2 = bytes[i + 2]; + int val; + try { + val = parseHexByte(c1, c2); + } catch (ArrayIndexOutOfBoundsException e) { + throw new URISyntaxException(s, JGitText.get().cannotParseGitURIish); + } os[j++] = (byte) val; i += 2; } else |