Merge branch 'PHP-5.5' into PHP-5.6

remicollet · remicollet · commit 99b91f98b11c · 2013-12-19T10:54:06.000+01:00
* PHP-5.5:
  Fixed Bug #66321 (ZipArchive::open() ze_obj-&gt;filename_len not real)
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c
@@ -1555,7 +1555,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
`@@ -1555,7 +1555,7 @@ static ZIPARCHIVE_METHOD(open)`
`1555`	`1555`	`RETURN_LONG((long)err);`
`1556`	`1556`	`}`
`1557`	`1557`	`ze_obj->filename = estrdup(resolved_path);`
`1558`		`- ze_obj->filename_len = filename_len;`
	`1558`	`+ ze_obj->filename_len = strlen(resolved_path);`
`1559`	`1559`	`ze_obj->za = intern;`
`1560`	`1560`	`RETURN_TRUE;`
`1561`	`1561`	`}`