From: Tom Tromey <tromey@redhat.com>
Date: Mon, 16 May 2005 20:27:48 +0000 (+0000)
Subject: re PR libgcj/21606 (java.net.URI fails to decode lowercase hex codes)
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92f0ebd126315ef51170df23efe38c251a7f6f2f;p=gcc.git

re PR libgcj/21606 (java.net.URI fails to decode lowercase hex codes)

	PR libgcj/21606:
	* java/net/URI.java (unquote): Handle lower-case letters as well.

From-SVN: r99792
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 1b35743c61e..94cdae92fef 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2005-05-16  Tom Tromey  <tromey@redhat.com>
+
+	PR libgcj/21606:
+	* java/net/URI.java (unquote): Handle lower-case letters as well.
+
 2005-05-16  Ziga Mahkovec  <ziga.mahkovec@klika.si>
 
 	PR libgcj/20504
diff --git a/libjava/java/net/URI.java b/libjava/java/net/URI.java
index 95577fca456..c466b719816 100644
--- a/libjava/java/net/URI.java
+++ b/libjava/java/net/URI.java
@@ -313,9 +313,8 @@ public final class URI
 	  {
 	    if (i + 2 >= str.length())
 	      throw new URISyntaxException(str, "Invalid quoted character");
-	    String hex = "0123456789ABCDEF";
-	    int hi = hex.indexOf(str.charAt(++i));
-	    int lo = hex.indexOf(str.charAt(++i));
+	    int hi = Character.digit(str.charAt(++i), 16);
+	    int lo = Character.digit(str.charAt(++i), 16);
 	    if (lo < 0 || hi < 0)
 	      throw new URISyntaxException(str, "Invalid quoted character");
 	    buf[pos++] = (byte) (hi * 16 + lo);