1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
|
From bf58162ddf970f63502837f366930e44d6a992cf Mon Sep 17 00:00:00 2001
From: Stanislav Malyshev <stas@php.net>
Date: Sat, 4 Jul 2015 21:01:50 -0700
Subject: [PATCH] Fix bug #69958 - Segfault in Phar::convertToData on invalid
file
---
ext/phar/phar_object.c | 70 ++++++++++++++++++++++---------------------
3 files changed, 50 insertions(+), 34 deletions(-)
Index: php5-5.3.3.1/ext/phar/phar_object.c
===================================================================
--- php5-5.3.3.1.orig/ext/phar/phar_object.c 2015-07-28 14:22:55.000000000 +0200
+++ php5-5.3.3.1/ext/phar/phar_object.c 2015-07-28 14:22:55.000000000 +0200
@@ -2483,7 +2483,9 @@
zend_hash_destroy(&(phar->manifest));
zend_hash_destroy(&(phar->mounted_dirs));
zend_hash_destroy(&(phar->virtual_dirs));
- php_stream_close(phar->fp);
+ if (phar->fp) {
+ php_stream_close(phar->fp);
+ }
efree(phar->fname);
efree(phar);
return NULL;
|
