From: Felipe Pena <felipensp@gmail.com>
Date: Mon, 4 Jun 2012 23:07:14 +0000 (-0300)
Subject: - Fixed bug #62227 (Invalid phar stream path causes crash)
X-Git-Tag: php-5.3.15RC1~50^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15213768e6cc098ab4e53cacc3b5eb86fa85284a;p=php

- Fixed bug #62227 (Invalid phar stream path causes crash)
---

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index 4ab2b86376..8a0ebfae18 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, '/');