iliaa           Tue Aug 26 21:10:11 2003 EDT

  Modified files:              
    /php-src/main/streams       plain_wrapper.c 
  Log:
  Prevent a crash when expand_filepath() fails.
  
  
Index: php-src/main/streams/plain_wrapper.c
diff -u php-src/main/streams/plain_wrapper.c:1.20 
php-src/main/streams/plain_wrapper.c:1.21
--- php-src/main/streams/plain_wrapper.c:1.20   Sat Jul  5 04:25:25 2003
+++ php-src/main/streams/plain_wrapper.c        Tue Aug 26 21:10:10 2003
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: plain_wrapper.c,v 1.20 2003/07/05 08:25:25 wez Exp $ */
+/* $Id: plain_wrapper.c,v 1.21 2003/08/27 01:10:10 iliaa Exp $ */
 
 #include "php.h"
 #include "php_globals.h"
@@ -100,7 +100,9 @@
                return NULL;
        }
        
-       realpath = expand_filepath(filename, NULL TSRMLS_CC);
+       if ((realpath = expand_filepath(filename, NULL TSRMLS_CC)) == NULL) {
+               return NULL;
+       }
 
        if (persistent) {
                spprintf(&persistent_id, 0, "streams_stdio_%d_%s", open_flags, 
realpath);

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

Reply via email to