xnu-7195.81.3.tar.gz

[apple/xnu.git] / bsd / libkern / url_encode.c

diff --git a/bsd/libkern/url_encode.c b/bsd/libkern/url_encode.c
index 28534ada1108d88c47be4384bbdaa3cfa729fdd6..0ca3d5eb0a17fa7bd5ba916d718aa637184fa539 100644 (file)
--- a/bsd/libkern/url_encode.c
+++ b/bsd/libkern/url_encode.c
@@ -66,18 +66,15 @@ url_decode(char *str)
                                c += hex2int(*str++);
                        }
                        if (*str) {
                                c += hex2int(*str++);
                        }
                        if (*str) {

-                               c = (c << 4) + hex2int(*str++);
+                               c = (char)((c << 4) + hex2int(*str++));

                        }
 
                        if (isprint(c)) {
                                /* overwrite the '%' with the new char, and bump the rest of the
                                 * string down a few characters */
                                *esc++ = c;
                        }
 
                        if (isprint(c)) {
                                /* overwrite the '%' with the new char, and bump the rest of the
                                 * string down a few characters */
                                *esc++ = c;

-                               str = memmove(esc, str, strlen(str)+1);
-                       } else {
-                               str++;
+                               str = memmove(esc, str, strlen(str) + 1);

                        }
                        }

-

                } else {
                        str++;
                }
                } else {
                        str++;
                }