summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorFelipe Pena <felipensp@gmail.com>2012-06-04 23:07:14 (GMT)
committerFelipe Pena <felipensp@gmail.com>2012-06-04 23:07:14 (GMT)
commit15213768e6cc098ab4e53cacc3b5eb86fa85284a (patch)
treed480b4668cd27dbfe57113d9374207484c554dc9 /ext
parent167e2fd78224887144496cdec2089cd5b2f3312d (diff)
downloadphp-15213768e6cc098ab4e53cacc3b5eb86fa85284a.tar.gz
- Fixed bug #62227 (Invalid phar stream path causes crash)
Diffstat (limited to 'ext')
-rw-r--r--ext/phar/phar.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 4ab2b86..8a0ebfa 100644
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -1799,7 +1799,11 @@ static int phar_analyze_path(const char *fname, const char *ext, int ext_len, in
#ifdef PHP_WIN32
phar_unixify_path_separators(realpath, strlen(realpath));
#endif
- a = strstr(realpath, fname) + ((ext - fname) + ext_len);
+ if ((a = strstr(realpath, fname)) == NULL) {
+ return FAILURE;
+ }
+
+ a += ((ext - fname) + ext_len);
*a = '\0';
slash = strrchr(realpath, '/');