fix several errors found by valgrind

1 - entry metadata not properly processed or retrieved from cached phars
2 - copy on write was using a void return value instead of int, a dangerous oversight in phar_update_cached_entry
3 - metadata creation in entries for cached phars was causing an invalid read

1 files changed, 3 insertions, 1 deletions

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 31efbcab33..45c999a5af 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -1114,7 +1114,9 @@ static int phar_parse_pharfile(php_stream *fp, char *fname, int fname_len, char
 		}
 
 		if (entry.is_persistent) {
-			if (phar_parse_metadata(&buffer, &entry.metadata, 0 TSRMLS_CC) == FAILURE) {
+			PHAR_GET_32(buffer, entry.metadata_len);
+			if (!entry.metadata_len) buffer -= 4;
+			if (phar_parse_metadata(&buffer, &entry.metadata, entry.metadata_len TSRMLS_CC) == FAILURE) {
 				pefree(entry.filename, entry.is_persistent);
 				MAPPHAR_FAIL("unable to read file metadata in .phar file \"%s\"");
 			}