From: Pierre Joye <pajoye@php.net>
Date: Mon, 30 Oct 2006 17:28:29 +0000 (+0000)
Subject: - fix leak in statName and statIndex
X-Git-Tag: RELEASE_1_0_0RC1~1182
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=602f95053af4145f04af612a7e0b6305cfb287f6;p=php

- fix leak in statName and statIndex
- use zip_locate_name instead of zip_stat in setCommentName (faster and
  work around for a possible bug)
---

diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
index e89c31bd45..63ddc7445f 100644
--- a/ext/zip/php_zip.c
+++ b/ext/zip/php_zip.c
@@ -183,7 +183,7 @@ static int php_zip_extract_file(struct zip * za, char *dest, char *file TSRMLS_D
 #define RETURN_SB(sb) \
 	{ \
 		array_init(return_value); \
-		add_assoc_string(return_value, "name", estrdup((sb)->name), 0); \
+		add_assoc_string(return_value, "name", (char *)(sb)->name, 1); \
 		add_assoc_long(return_value, "index", (long) (sb)->index); \
 		add_assoc_long(return_value, "crc", (long) (sb)->crc); \
 		add_assoc_long(return_value, "size", (long) (sb)->size); \
@@ -1250,7 +1250,7 @@ ZIPARCHIVE_METHOD(setCommentName)
 	zval *this = getThis();
 	int comment_len, name_len;
 	char * comment, *name;
-	struct zip_stat sb;
+	int idx;
 
 	if (!this) {
 		RETURN_FALSE;
@@ -1263,9 +1263,11 @@ ZIPARCHIVE_METHOD(setCommentName)
 		return;
 	}
 
-
-	PHP_ZIP_STAT_PATH(intern, name, name_len, 0, sb);
-	PHP_ZIP_SET_FILE_COMMENT(intern, sb.index, comment, comment_len);
+	idx = zip_name_locate(intern, name, 0);
+	if (idx < 0) {
+		RETURN_FALSE;
+	}
+	PHP_ZIP_SET_FILE_COMMENT(intern, idx, comment, comment_len);
 }
 /* }}} */