From d698f0ae51f67c9cce870b09c59df3d6ba959244 Mon Sep 17 00:00:00 2001 From: Stanislav Malyshev Date: Mon, 28 Sep 2015 15:51:59 -0700 Subject: [PATCH] Fix bug #69720: Null pointer dereference in phar_get_fp_offset() --- ext/phar/util.c | 6 +++++- 1 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 ext/phar/tests/bug69720.phar create mode 100644 ext/phar/tests/bug69720.phpt Index: php5-5.3.3.1/ext/phar/util.c =================================================================== --- php5-5.3.3.1.orig/ext/phar/util.c 2015-10-18 19:52:03.000000000 +0200 +++ php5-5.3.3.1/ext/phar/util.c 2015-10-18 19:52:03.000000000 +0200 @@ -716,7 +716,11 @@ (*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); }