cvs: php4 /main safe_mode.c
| From: | James E. Flemer | Date: | Sun, 03 Mar 2002 21:12:49 +0000 |
| Subject: | cvs: php4 /main safe_mode.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-9611@lists.php.net to get a copy of this message | ||
jflemer Sun Mar 3 16:12:49 2002 EDT
Modified files:
/php4/main safe_mode.c
Log:
(php_checkuid) Added case for root directory when mode is
not CHECKUID_ALLOW_ONLY_DIR.
Index: php4/main/safe_mode.c
diff -u php4/main/safe_mode.c:1.41 php4/main/safe_mode.c:1.42
--- php4/main/safe_mode.c:1.41 Sun Mar 3 15:49:04 2002
+++ php4/main/safe_mode.c Sun Mar 3 16:12:49 2002
@@ -15,7 +15,7 @@
| Author: Rasmus Lerdorf <rasmus@lerdorf.on.ca> |
+----------------------------------------------------------------------+
*/
-/* $Id: safe_mode.c,v 1.41 2002/03/03 20:49:04 jflemer Exp $ */
+/* $Id: safe_mode.c,v 1.42 2002/03/03 21:12:49 jflemer Exp $ */
#include "php.h"
@@ -98,7 +98,10 @@
/* Trim off filename */
if ((s = strrchr(path, DEFAULT_SLASH))) {
- *s = '\0';
+ if (s == path)
+ path[1] = '\0';
+ else
+ *s = '\0';
}
} else { /* CHECKUID_ALLOW_ONLY_DIR */
s = strrchr(filename, DEFAULT_SLASH);