diff options
| author | Stanislav Malyshev <stas@php.net> | 2015-09-28 16:59:46 -0700 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2015-09-28 16:59:46 -0700 |
| commit | f39a4ee0c971177bc873d282c39ee1b670652f5c (patch) | |
| tree | 03f24006bd5c616b171828a01b4d9da45800f488 /ext/phar/util.c | |
| parent | 629e4da7cc8b174acdeab84969cbfc606a019b31 (diff) | |
| parent | d698f0ae51f67c9cce870b09c59df3d6ba959244 (diff) | |
| download | php-git-f39a4ee0c971177bc873d282c39ee1b670652f5c.tar.gz | |
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5:
Fix bug #69720: Null pointer dereference in phar_get_fp_offset()
Diffstat (limited to 'ext/phar/util.c')
| -rw-r--r-- | ext/phar/util.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ext/phar/util.c b/ext/phar/util.c index 746edf3dab..fb3c8beac7 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -494,7 +494,11 @@ really_get_entry: (*ret)->is_tar = entry->is_tar; (*ret)->fp = phar_get_efp(entry, 1 TSRMLS_CC); if (entry->link) { - (*ret)->zero = phar_get_fp_offset(phar_get_link_source(entry TSRMLS_CC) TSRMLS_CC); + phar_entry_info *link = phar_get_link_source(entry TSRMLS_CC); + if(!link) { + return FAILURE; + } + (*ret)->zero = phar_get_fp_offset(link TSRMLS_CC); } else { (*ret)->zero = phar_get_fp_offset(entry TSRMLS_CC); } |