cvs: php4 /ext/bz2 bz2.c
| From: | Andi Gutmans | Date: | Sat, 19 May 2001 16:13:02 +0000 |
| Subject: | cvs: php4 /ext/bz2 bz2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-5845@lists.php.net to get a copy of this message | ||
andi Sat May 19 09:13:02 2001 EDT
Modified files:
/php4/ext/bz2 bz2.c
Log:
- Fix crash bug in bzopen() when specifying invalid filename
@ Fixed crash bug in bzopen() when specifying an invalid file. (Andi)
Index: php4/ext/bz2/bz2.c
diff -u php4/ext/bz2/bz2.c:1.14 php4/ext/bz2/bz2.c:1.15
--- php4/ext/bz2/bz2.c:1.14 Sat May 12 14:52:11 2001
+++ php4/ext/bz2/bz2.c Sat May 19 09:13:02 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2.c,v 1.14 2001/05/12 21:52:11 wez Exp $ */
+/* $Id: bz2.c,v 1.15 2001/05/19 16:13:02 andi Exp $ */
#include "php.h"
@@ -117,6 +117,11 @@
else {
ZEND_FETCH_RESOURCE(fp, FILE *, file, -1, "File Handle", php_file_le_fopen());
bz = BZ2_bzdopen(fileno(fp), Z_STRVAL_PP(mode));
+ }
+
+ if (bz == NULL) {
+ php_error(E_WARNING, "bzopen(): Unable to open file\n");
+ RETURN_FALSE;
}
ZEND_REGISTER_RESOURCE(return_value, bz, le_bz2);