[PHP-CVS] cvs: php-src(PHP_4_3) /main safe_mode.c

[Stefan Esser]

sesser          Wed Dec  1 17:37:59 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/main       safe_mode.c 
  Log:
  MFH
  
  
http://cvs.php.net/diff.php/php-src/main/safe_mode.c?r1=1.51.2.4&r2=1.51.2.5&ty=u
Index: php-src/main/safe_mode.c
diff -u php-src/main/safe_mode.c:1.51.2.4 php-src/main/safe_mode.c:1.51.2.5
--- php-src/main/safe_mode.c:1.51.2.4   Mon Mar 17 08:50:23 2003
+++ php-src/main/safe_mode.c    Wed Dec  1 17:37:59 2004
@@ -15,7 +15,7 @@
    | Author: Rasmus Lerdorf <[EMAIL PROTECTED]>                        |
    +----------------------------------------------------------------------+
  */
-/* $Id: safe_mode.c,v 1.51.2.4 2003/03/17 13:50:23 wez Exp $ */
+/* $Id: safe_mode.c,v 1.51.2.5 2004/12/01 22:37:59 sesser Exp $ */
 
 #include "php.h"
 
@@ -54,13 +54,15 @@
        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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php