diff options
| author | Felipe Pena <felipensp@gmail.com> | 2013-10-20 09:04:36 -0200 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2013-10-20 09:04:36 -0200 |
| commit | d23f089fb94b8a3fec07d58a6801fe078c32dd3e (patch) | |
| tree | a549f56eac36e59207220aa0d12737a9058e0d17 | |
| parent | b7c64683da3e8a632a37673052205d3cab6ad876 (diff) | |
| parent | 5b0560efc3e803cdb59d161cb3cd660e388b211f (diff) | |
| download | php-git-d23f089fb94b8a3fec07d58a6801fe078c32dd3e.tar.gz | |
Merge branch 'PHP-5.5'
* PHP-5.5:
- Fixed possible NULL ptr dereference
| -rw-r--r-- | ext/phar/util.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext/phar/util.c b/ext/phar/util.c index dfb2c92f9e..327dfa4eb8 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -1015,8 +1015,10 @@ alias_success: spprintf(error, 0, "alias \"%s\" is already used for archive \"%s\" cannot be overloaded with \"%s\"", alias, (*fd_ptr)->fname, fname); } if (SUCCESS == phar_free_alias(*fd_ptr, alias, alias_len TSRMLS_CC)) { - efree(*error); - *error = NULL; + if (error) { + efree(*error); + *error = NULL; + } } return FAILURE; } |