uhttpd: fix bug in path canonization introduced by r20883

SVN-Revision: 20885
2010-04-15 20:08:56 +00:00 · 2010-04-15 20:08:56 +00:00 · 14428874ae
parent 20ef055c2f
commit 14428874ae
1 changed files with 3 additions and 2 deletions
--- a/package/uhttpd/src/uhttpd-utils.c
+++ b/package/uhttpd/src/uhttpd-utils.c
@ -420,8 +420,9 @@ static char * canonpath(const char *path, char *path_resolved)
 				}

 				/* collapse /x/../ */
-				else if( path_cpy[2] == '.' )
-				{
+				else if( (path_cpy[2] == '.') &&
+				         ((path_cpy[3] == '/') || (path_cpy[3] == '\0'))
+				) {
 					while( (path_res > path_resolved) && (*--path_res != '/') )
 						;