pajoye Fri Jan 2 00:10:21 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/zip php_zip.c
Log:
- fix filename property read
http://cvs.php.net/viewvc.cgi/php-src/ext/zip/php_zip.c?r1=1.1.2.38.2.25&r2=1.1.2.38.2.26&diff_format=u
Index: php-src/ext/zip/php_zip.c
diff -u php-src/ext/zip/php_zip.c:1.1.2.38.2.25
php-src/ext/zip/php_zip.c:1.1.2.38.2.26
--- php-src/ext/zip/php_zip.c:1.1.2.38.2.25 Mon Nov 17 11:28:01 2008
+++ php-src/ext/zip/php_zip.c Fri Jan 2 00:10:20 2009
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_zip.c,v 1.1.2.38.2.25 2008/11/17 11:28:01 felipe Exp $ */
+/* $Id: php_zip.c,v 1.1.2.38.2.26 2009/01/02 00:10:20 pajoye Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -442,6 +442,7 @@
static char * php_zipobj_get_filename(ze_zip_object *obj TSRMLS_DC) /* {{{ */
{
+
if (!obj) {
return NULL;
}
@@ -791,7 +792,7 @@
switch (hnd->type) {
case IS_STRING:
if (retchar) {
- ZVAL_STRINGL(*retval, (char *) retchar, len, 1);
+ ZVAL_STRING(*retval, (char *) retchar, 1);
} else {
ZVAL_EMPTY_STRING(*retval);
}
@@ -2670,7 +2671,7 @@
php_info_print_table_start();
php_info_print_table_row(2, "Zip", "enabled");
- php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.38.2.25 2008/11/17 11:28:01 felipe Exp $");
+ php_info_print_table_row(2, "Extension Version","$Id: php_zip.c,v
1.1.2.38.2.26 2009/01/02 00:10:20 pajoye Exp $");
php_info_print_table_row(2, "Zip version", PHP_ZIP_VERSION_STRING);
php_info_print_table_row(2, "Libzip version", "0.9.0");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
