Index: UrlEncoded.java
===================================================================
--- UrlEncoded.java	(revision 6311)
+++ UrlEncoded.java	(working copy)
@@ -653,7 +653,7 @@
                         catch(NumberFormatException nfe)
                         {
                             buffer.getStringBuffer().append('%');
-                            for(char next; ((next=encoded.charAt(++i+offset))!='%');)
+                            for(char next; ( ((++i)+offset < encoded.length()) && (next=encoded.charAt(i+offset))!='%');)
                                 buffer.getStringBuffer().append((next=='+' ? ' ' : next));
                         }