]> granicus.if.org Git - php/commitdiff
- fix filename property read
authorPierre Joye <pajoye@php.net>
Fri, 2 Jan 2009 00:10:20 +0000 (00:10 +0000)
committerPierre Joye <pajoye@php.net>
Fri, 2 Jan 2009 00:10:20 +0000 (00:10 +0000)
ext/zip/php_zip.c

index 8faa0cf0f91e55d7bbd48107bfdb8f5d0cbb9e6f..b970b62ec84b6eeb43836d1bffd916a0fb70a82b 100644 (file)
@@ -442,6 +442,7 @@ static int php_zip_get_num_files(struct zip *za TSRMLS_DC) /* {{{ */
 
 static char * php_zipobj_get_filename(ze_zip_object *obj TSRMLS_DC) /* {{{ */
 {
+
        if (!obj) {
                return NULL;
        }
@@ -791,7 +792,7 @@ static int php_zip_property_reader(ze_zip_object *obj, zip_prop_handler *hnd, zv
        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);
                        }