cvs: php-src(PHP_4_3) / NEWS /ext/bz2 bz2.c
| From: | Antony Dovgal | Date: | Sat, 19 Mar 2005 13:56:57 +0000 |
| Subject: | cvs: php-src(PHP_4_3) / NEWS /ext/bz2 bz2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31013@lists.php.net to get a copy of this message | ||
tony2001 Sat Mar 19 08:56:57 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/bz2 bz2.c
Log:
MFH: fix segfault in bzopen()
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.858&r2=1.1247.2.859&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.858 php-src/NEWS:1.1247.2.859
--- php-src/NEWS:1.1247.2.858 Thu Mar 17 08:13:08 2005
+++ php-src/NEWS Sat Mar 19 08:56:55 2005
@@ -6,6 +6,8 @@
and gmp_fact() to prevent SIGFPE. (Tony)
- Changed phpize not to require libtool. (Jani)
- Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
+- Fixed bug #32373 (segfault in bzopen() if supplied path to non-existent
+ file). (Tony)
- Fixed bug #32340 (insert_before($node,NULL) does not return). (Rob)
- Fixed bug #32114 (DOM crashing when attribute appended to Document). (Rob)
Fixed bugs:
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.1.2.3&r2=1.1.2.4&ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.1.2.3 php-src/ext/bz2/bz2.c:1.1.2.4
--- php-src/ext/bz2/bz2.c:1.1.2.3 Wed Aug 25 10:22:48 2004
+++ php-src/ext/bz2/bz2.c Sat Mar 19 08:56:56 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2.c,v 1.1.2.3 2004/08/25 14:22:48 iliaa Exp $ */
+/* $Id: bz2.c,v 1.1.2.4 2005/03/19 13:56:56 tony2001 Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -196,7 +196,7 @@
/* remove the file created by php_stream_open_wrapper(), it is not needed since BZ2 functions
* failed.
*/
- if (!bz_file && mode[0] == 'w') {
+ if (opened_path && !bz_file && mode[0] == 'w') {
VCWD_UNLINK(*opened_path);
}
}