[PHP-CVS] cvs: php-src /ext/standard file.c

[Wez Furlong]

wez             Wed Jan 14 09:25:02 2004 EDT

  Modified files:              
    /php-src/ext/standard       file.c 
  Log:
  Fix #26772: fgets returns NULL instead of FALSE.
  
  
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.374 php-src/ext/standard/file.c:1.375
--- php-src/ext/standard/file.c:1.374   Thu Jan  8 03:17:31 2004
+++ php-src/ext/standard/file.c Wed Jan 14 09:25:01 2004
@@ -21,7 +21,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: file.c,v 1.374 2004/01/08 08:17:31 andi Exp $ */
+/* $Id: file.c,v 1.375 2004/01/14 14:25:01 wez Exp $ */
 
 /* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
 
@@ -907,7 +907,11 @@
                WRONG_PARAM_COUNT;
        }
 
-       php_stream_from_zval(stream, arg1);
+       php_stream_from_zval_no_verify(stream, arg1);
+       if (stream == NULL) {
+               /* we want false return value, rather than NULL */
+               goto exit_failed;
+       }
 
        if (argc == 1) {
                /* ask streams to give us a buffer of an appropriate size */

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