|
 |
925b0d |
Patch cleanup for 5.6.5
|
|
|
925b0d |
Binary diff removed
|
|
|
925b0d |
|
|
|
925b0d |
From d698f0ae51f67c9cce870b09c59df3d6ba959244 Mon Sep 17 00:00:00 2001
|
|
|
925b0d |
From: Stanislav Malyshev <stas@php.net>
|
|
|
925b0d |
Date: Mon, 28 Sep 2015 15:51:59 -0700
|
|
|
925b0d |
Subject: [PATCH] Fix bug #69720: Null pointer dereference in
|
|
|
925b0d |
phar_get_fp_offset()
|
|
|
925b0d |
|
|
|
925b0d |
---
|
|
|
925b0d |
ext/phar/tests/bug69720.phar | Bin 0 -> 8192 bytes
|
|
|
925b0d |
ext/phar/tests/bug69720.phpt | 40 ++++++++++++++++++++++++++++++++++++++++
|
|
|
925b0d |
ext/phar/util.c | 6 +++++-
|
|
|
925b0d |
3 files changed, 45 insertions(+), 1 deletion(-)
|
|
|
925b0d |
create mode 100644 ext/phar/tests/bug69720.phar
|
|
|
925b0d |
create mode 100644 ext/phar/tests/bug69720.phpt
|
|
|
925b0d |
|
|
|
925b0d |
diff --git a/ext/phar/util.c b/ext/phar/util.c
|
|
|
925b0d |
index 2c41adf..69da7b9 100644
|
|
|
925b0d |
--- a/ext/phar/util.c
|
|
|
925b0d |
+++ b/ext/phar/util.c
|
|
|
925b0d |
@@ -494,7 +494,11 @@ int phar_get_entry_data(phar_entry_data **ret, char *fname, int fname_len, char
|
|
|
925b0d |
(*ret)->is_tar = entry->is_tar;
|
|
|
925b0d |
(*ret)->fp = phar_get_efp(entry, 1 TSRMLS_CC);
|
|
|
925b0d |
if (entry->link) {
|
|
|
925b0d |
- (*ret)->zero = phar_get_fp_offset(phar_get_link_source(entry TSRMLS_CC) TSRMLS_CC);
|
|
|
925b0d |
+ phar_entry_info *link = phar_get_link_source(entry TSRMLS_CC);
|
|
|
925b0d |
+ if(!link) {
|
|
|
925b0d |
+ return FAILURE;
|
|
|
925b0d |
+ }
|
|
|
925b0d |
+ (*ret)->zero = phar_get_fp_offset(link TSRMLS_CC);
|
|
|
925b0d |
} else {
|
|
|
925b0d |
(*ret)->zero = phar_get_fp_offset(entry TSRMLS_CC);
|
|
|
925b0d |
}
|
|
|
925b0d |
From f98ab19dc0c978e3caaa2614579e4a61f2c317f5 Mon Sep 17 00:00:00 2001
|
|
|
925b0d |
From: Stanislav Malyshev <stas@php.net>
|
|
|
925b0d |
Date: Mon, 28 Sep 2015 20:43:18 -0700
|
|
|
925b0d |
Subject: [PATCH] fix memory leak
|
|
|
925b0d |
|
|
|
925b0d |
---
|
|
|
925b0d |
ext/phar/util.c | 1 +
|
|
|
925b0d |
1 file changed, 1 insertion(+)
|
|
|
925b0d |
|
|
|
925b0d |
diff --git a/ext/phar/util.c b/ext/phar/util.c
|
|
|
925b0d |
index 69da7b9..e7decda 100644
|
|
|
925b0d |
--- a/ext/phar/util.c
|
|
|
925b0d |
+++ b/ext/phar/util.c
|
|
|
925b0d |
@@ -496,6 +496,7 @@ int phar_get_entry_data(phar_entry_data **ret, char *fname, int fname_len, char
|
|
|
925b0d |
if (entry->link) {
|
|
|
925b0d |
phar_entry_info *link = phar_get_link_source(entry TSRMLS_CC);
|
|
|
925b0d |
if(!link) {
|
|
|
925b0d |
+ efree(*ret);
|
|
|
925b0d |
return FAILURE;
|
|
|
925b0d |
}
|
|
|
925b0d |
(*ret)->zero = phar_get_fp_offset(link TSRMLS_CC);
|