diff --git a/package/uhttpd/src/uhttpd-utils.c b/package/uhttpd/src/uhttpd-utils.c
index a47f175ba..1073f3bb3 100644
--- a/package/uhttpd/src/uhttpd-utils.c
+++ b/package/uhttpd/src/uhttpd-utils.c
@@ -305,6 +305,9 @@ int uh_http_send(
 }
 
 
+/* blen is the size of buf; slen is the length of src.  The input-string need
+** not be, and the output string will not be, null-terminated.  Returns the
+** length of the decoded string. */
 int uh_urldecode(char *buf, int blen, const char *src, int slen)
 {
 	int i;
@@ -315,11 +318,11 @@ int uh_urldecode(char *buf, int blen, const char *src, int slen)
 		(((x) <= 'F') ? ((x) - 'A' + 10) : \
 			((x) - 'a' + 10)))
 
-	for( i = 0; (i <= slen) && (i <= blen); i++ )
+	for( i = 0; (i < slen) && (len < blen); i++ )
 	{
 		if( src[i] == '%' )
 		{
-			if( ((i+2) <= slen) && isxdigit(src[i+1]) && isxdigit(src[i+2]) )
+			if( ((i+2) < slen) && isxdigit(src[i+1]) && isxdigit(src[i+2]) )
 			{
 				buf[len++] = (char)(16 * hex(src[i+1]) + hex(src[i+2]));
 				i += 2;
@@ -338,13 +341,16 @@ int uh_urldecode(char *buf, int blen, const char *src, int slen)
 	return len;
 }
 
+/* blen is the size of buf; slen is the length of src.  The input-string need
+** not be, and the output string will not be, null-terminated.  Returns the
+** length of the encoded string. */
 int uh_urlencode(char *buf, int blen, const char *src, int slen)
 {
 	int i;
 	int len = 0;
 	const char hex[] = "0123456789abcdef";
 
-	for( i = 0; (i <= slen) && (i <= blen); i++ )
+	for( i = 0; (i < slen) && (len < blen); i++ )
 	{
 		if( isalnum(src[i]) || (src[i] == '-') || (src[i] == '_') ||
 		    (src[i] == '.') || (src[i] == '~') )
@@ -355,7 +361,7 @@ int uh_urlencode(char *buf, int blen, const char *src, int slen)
 		{
 			buf[len++] = '%';
 			buf[len++] = hex[(src[i] >> 4) & 15];
-			buf[len++] = hex[(src[i] & 15) & 15];
+			buf[len++] = hex[ src[i]       & 15];
 		}
 		else
 		{
@@ -527,7 +533,7 @@ struct path_info * uh_path_lookup(struct client *cl, const char *url)
 			uh_urldecode(
 				&buffer[strlen(docroot)],
 				sizeof(buffer) - strlen(docroot) - 1,
-				url, (int)(pathptr - url) - 1
+				url, pathptr - url
 			);
 	}