cvs: php4 /ext/zip zip.c
| From: | Derick Rethans | Date: | Sun, 23 Dec 2001 01:59:12 +0000 |
| Subject: | cvs: php4 /ext/zip zip.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-8782@lists.php.net to get a copy of this message | ||
derick Sat Dec 22 20:59:12 2001 EDT
Modified files:
/php4/ext/zip zip.c
Log:
- Fix for bug 14554 - segfault upon zip_entry_open. (patch by
phpbug@robin.pfft.net)
Index: php4/ext/zip/zip.c
diff -u php4/ext/zip/zip.c:1.27 php4/ext/zip/zip.c:1.28
--- php4/ext/zip/zip.c:1.27 Tue Dec 11 10:30:57 2001
+++ php4/ext/zip/zip.c Sat Dec 22 20:59:10 2001
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zip.c,v 1.27 2001/12/11 15:30:57 sebastian Exp $ */
+/* $Id: zip.c,v 1.28 2001/12/23 01:59:10 derick Exp $ */
#include "php.h"
#include "php_ini.h"
@@ -250,10 +250,12 @@
zval *zzip_ent;
ZZIP_DIR *archive_p = NULL;
php_zzip_dirent *entry = NULL;
- int mode;
+ char *mode;
+ int mode_len;
- if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|l", &zzip_dp,
&zzip_ent, &mode) == FAILURE)
+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr|s", &zzip_dp,
&zzip_ent, &mode, &mode_len) == FAILURE) {
return;
+ }
ZEND_FETCH_RESOURCE(archive_p, ZZIP_DIR *, &zzip_dp, -1, le_zip_dir_name,
le_zip_dir);
ZEND_FETCH_RESOURCE(entry, php_zzip_dirent *, &zzip_ent, -1, le_zip_entry_name,
le_zip_entry);