Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real)

remicollet · remicollet · commit 20eb8e4d11d4 · 2013-12-19T10:53:38.000+01:00
diff --git a/NEWS b/NEWS
@@ -31,6 +31,9 @@ PHP                                                                        NEWS
   . Fixed bug #49634 (Segfault throwing an exception in a XSL registered
     function). (Mike)
 
+- ZIP:
+  . Fixed Bug #66321 (ZipArchive::open() ze_obj->filename_len not real). (Remi)
+
 12 Dec 2013, PHP 5.4.23
 
 - Core:
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -1537,7 +1537,7 @@ static ZIPARCHIVE_METHOD(open)
 		RETURN_LONG((long)err);
 	}
 	ze_obj->filename = estrdup(resolved_path);
-	ze_obj->filename_len = filename_len;
+	ze_obj->filename_len = strlen(resolved_path);
 	ze_obj->za = intern;
 	RETURN_TRUE;
 }

Original file line number	Diff line number	Diff line change
`@@ -1537,7 +1537,7 @@ static ZIPARCHIVE_METHOD(open)`
`1537`	`1537`	`RETURN_LONG((long)err);`
`1538`	`1538`	`}`
`1539`	`1539`	`ze_obj->filename = estrdup(resolved_path);`
`1540`		`- ze_obj->filename_len = filename_len;`
	`1540`	`+ ze_obj->filename_len = strlen(resolved_path);`
`1541`	`1541`	`ze_obj->za = intern;`
`1542`	`1542`	`RETURN_TRUE;`
`1543`	`1543`	`}`