cvs: php4 /ext/bz2 bz2.c
| From: | Andrei Zmievski | Date: | Thu, 13 Jun 2002 15:04:24 +0000 |
| Subject: | cvs: php4 /ext/bz2 bz2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12346@lists.php.net to get a copy of this message | ||
andrei Thu Jun 13 11:04:24 2002 EDT
Modified files:
/php4/ext/bz2 bz2.c
Log:
Fix #17650.
@- Fixed bzopen() crash in thread-safe mode. (Andrei)
Index: php4/ext/bz2/bz2.c
diff -u php4/ext/bz2/bz2.c:1.50 php4/ext/bz2/bz2.c:1.51
--- php4/ext/bz2/bz2.c:1.50 Tue Jun 11 17:16:22 2002
+++ php4/ext/bz2/bz2.c Thu Jun 13 11:04:23 2002
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: bz2.c,v 1.50 2002/06/11 21:16:22 mfischer Exp $ */
+/* $Id: bz2.c,v 1.51 2002/06/13 15:04:23 andrei Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -170,16 +170,14 @@
#ifdef VIRTUAL_DIR
virtual_filepath(path, &path_copy TSRMLS_CC);
#else
- path_copy = estrdup(path);
+ path_copy = path;
#endif
/* try and open it directly first */
bz_file = BZ2_bzopen(path_copy, mode);
- if (opened_path == NULL) {
- efree(path_copy);
- } else if (bz_file) {
- *opened_path = path_copy;
+ if (opened_path && bz_file) {
+ *opened_path = estrndup(path_copy);
}
path_copy = NULL;