summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Beaver <cellog@php.net>2008-04-16 04:15:08 +0000
committerGreg Beaver <cellog@php.net>2008-04-16 04:15:08 +0000
commit8c4477cde55cb5d6e20bdf658598c4d7022c7c1f (patch)
tree2cd58e96f7e28833cf09ef3c9310a986bd82b655
parentf513caa0a6acbe697748704cae67ef974c2ca2c6 (diff)
downloadphp-git-8c4477cde55cb5d6e20bdf658598c4d7022c7c1f.tar.gz
fix segfault in meta-data parsing of zip archives
-rw-r--r--ext/phar/phar.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 0c74bddb54..8cbb1f8ff4 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -521,7 +521,9 @@ int phar_parse_metadata(char **buffer, zval **metadata, int zip_metadata_len TSR
} else {
*metadata = NULL;
}
- *buffer += buf_len;
+ if (!zip_metadata_len) {
+ *buffer += buf_len;
+ }
return SUCCESS;
}
/* }}}*/