@@ -930,10 +930,15 @@ uri_urldecode(char *s)

                         s[o]=' ';

                 else if(s[i]=='%' && (a=s[i+1])!='\0' && (b=s[i+2])!='\0' && ISHEXNIBBLE(a) && ISHEXNIBBLE(b)) {

                         n=(HEXNIBBLE2BIN(a)<<4)|HEXNIBBLE2BIN(b);

-                        s[o]=128|64|(n>>6);

-                        s[o+1]=128|(n&0x3f);

-                        i+=2;

-                        o++;

+                        if(n>=128) {

+                                s[o]=128|64|(n>>6);

+                                s[o+1]=128|(n&0x3f);

+                                i+=2;

+                                o++;

+                        } else {

+                                s[o]=n;

+                                i+=2;

+                        }

                 } else

                         s[o]=s[i];

         }