wez Wed Jan 14 09:31:28 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/standard file.c
Log:
Fixed bug #26772 (fgets returns NULL instead of FALSE). (Wez)
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.524 php-src/NEWS:1.1247.2.525
--- php-src/NEWS:1.1247.2.524 Tue Jan 13 18:31:44 2004
+++ php-src/NEWS Wed Jan 14 09:31:25 2004
@@ -4,6 +4,7 @@
- Fixed bug #26878 (problem with multiple references to the same variable
with different types). (Ilia)
- Fixed bug #26896 (ext/ftp does not work as shared extension). (Jani)
+- Fixed bug #26772 (fgets returns NULL instead of FALSE). (Wez)
12 Jan 2004, Version 4.3.5RC1
- Synchronized bundled GD library with GD 2.0.17
Index: php-src/ext/standard/file.c
diff -u php-src/ext/standard/file.c:1.279.2.52 php-src/ext/standard/file.c:1.279.2.53
--- php-src/ext/standard/file.c:1.279.2.52 Fri Jan 2 19:50:01 2004
+++ php-src/ext/standard/file.c Wed Jan 14 09:31:27 2004
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: file.c,v 1.279.2.52 2004/01/03 00:50:01 iliaa Exp $ */
+/* $Id: file.c,v 1.279.2.53 2004/01/14 14:31:27 wez Exp $ */
/* Synced with php 3.0 revision 1.218 1999-06-16 [ssb] */
@@ -1363,7 +1363,11 @@
WRONG_PARAM_COUNT;
}
- php_stream_from_zval(stream, arg1);
+ php_stream_from_zval_no_verify(stream, arg1);
+ if (stream == NULL) {
+ /* want a false return value here */
+ 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
