cvs: php-src(PHP_5_0) /main safe_mode.c
| From: | Stefan Esser | Date: | Wed, 01 Dec 2004 22:37:47 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /main safe_mode.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29381@lists.php.net to get a copy of this message | ||
sesser Wed Dec 1 17:37:47 2004 EDT
Modified files: (Branch: PHP_5_0)
/php-src/main safe_mode.c
Log:
MFH
http://cvs.php.net/diff.php/php-src/main/safe_mode.c?r1=1.58&r2=1.58.2.1&ty=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.58 php-src/main/safe_mode.c:1.58.2.1
--- php-src/main/safe_mode.c:1.58 Thu Jan 8 03:17:54 2004
+++ php-src/main/safe_mode.c Wed Dec 1 17:37:47 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: safe_mode.c,v 1.58 2004/01/08 08:17:54 andi Exp $ */
+/* $Id: safe_mode.c,v 1.58.2.1 2004/12/01 22:37:47 sesser Exp $ */
#include "php.h"
@@ -55,13 +55,16 @@
php_stream_wrapper *wrapper = NULL;
TSRMLS_FETCH();
- strlcpy(filenamecopy, filename, MAXPATHLEN);
- filename=(char *)&filenamecopy;
-
if (!filename) {
return 0; /* path must be provided */
}
+ if (strlcpy(filenamecopy, filename, MAXPATHLEN)>=MAXPATHLEN) {
+ return 0;
+ }
+ filename=(char *)&filenamecopy;
+
+
if (fopen_mode) {
if (fopen_mode[0] == 'r') {
mode = CHECKUID_DISALLOW_FILE_NOT_EXISTS;