From 15213768e6cc098ab4e53cacc3b5eb86fa85284a Mon Sep 17 00:00:00 2001 From: Felipe Pena Date: Mon, 4 Jun 2012 20:07:14 -0300 Subject: - Fixed bug #62227 (Invalid phar stream path causes crash) --- ext/phar/phar.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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, '/'); -- cgit v0.12