com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/phar/util.c

Commit: e7574a5329f8392726b1cbb85041ad86a18d6763 Author: Stanislav Malyshev <stas@php.net> Mon, 28 Sep 2015 17:00:32 -0700 Parents: 899753f24089e27c7f2a7f169aa042564d6f6a63 f39a4ee0c971177bc873d282c39ee1b670652f5c Branches: PHP-7.0 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=e7574a5329f8392726b1cbb85041ad86a18d6763 Log: Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: Fix bug #69720: Null pointer dereference in phar_get_fp_offset() Conflicts: ext/phar/util.c Bugs: https://bugs.php.net/69720 Changed paths: MM ext/phar/util.c Diff: diff --cc ext/phar/util.c index d561342,fb3c8be..54a9286 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@@ -491,11 -492,15 +491,15 @@@ really_get_entry (*ret)->internal_file = entry; (*ret)->is_zip = entry->is_zip; (*ret)->is_tar = entry->is_tar; - (*ret)->fp = phar_get_efp(entry, 1 TSRMLS_CC); + (*ret)->fp = phar_get_efp(entry, 1); if (entry->link) { - (*ret)->zero = phar_get_fp_offset(phar_get_link_source(entry)); - phar_entry_info *link = phar_get_link_source(entry TSRMLS_CC); ++ phar_entry_info *link = phar_get_link_source(entry); + if(!link) { + return FAILURE; + } - (*ret)->zero = phar_get_fp_offset(link TSRMLS_CC); ++ (*ret)->zero = phar_get_fp_offset(link); } else { - (*ret)->zero = phar_get_fp_offset(entry TSRMLS_CC); + (*ret)->zero = phar_get_fp_offset(entry); } if (!phar->is_persistent) {