cvs: php-src(PHP_5_0) / NEWS /ext/bz2 bz2.c
| From: | Antony Dovgal | Date: | Sat, 19 Mar 2005 13:56:32 +0000 |
| Subject: | cvs: php-src(PHP_5_0) / NEWS /ext/bz2 bz2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-31012@lists.php.net to get a copy of this message | ||
tony2001 Sat Mar 19 08:56:32 2005 EDT
Modified files: (Branch: PHP_5_0)
/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.1760.2.292&r2=1.1760.2.293&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1760.2.292 php-src/NEWS:1.1760.2.293
--- php-src/NEWS:1.1760.2.292 Thu Mar 17 15:51:01 2005
+++ php-src/NEWS Sat Mar 19 08:56:30 2005
@@ -11,6 +11,8 @@
- Changed phpize not to require libtool. (Jani)
- Updated bundled oniguruma library (used for multibyte regular expression)
to 3.7.0. (Moriyoshi)
+- Fixed bug #32373 (segfault in bzopen() if supplied path to non-existent
+ file). (Tony)
- Updated bundled libmbfl library (used for multibyte functions). (Moriyoshi)
Fixed bugs:
. Bug #32063 (mb_convert_encoding ignores named entity 'alpha')
http://cvs.php.net/diff.php/php-src/ext/bz2/bz2.c?r1=1.6.2.1&r2=1.6.2.2&ty=u
Index: php-src/ext/bz2/bz2.c
diff -u php-src/ext/bz2/bz2.c:1.6.2.1 php-src/ext/bz2/bz2.c:1.6.2.2
--- php-src/ext/bz2/bz2.c:1.6.2.1 Wed Feb 23 13:48:57 2005
+++ php-src/ext/bz2/bz2.c Sat Mar 19 08:56:31 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2.c,v 1.6.2.1 2005/02/23 18:48:57 iliaa Exp $ */
+/* $Id: bz2.c,v 1.6.2.2 2005/03/19 13:56:31 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);
}
}