php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-28 10:12:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.4' into PHP-5.5

Browse Source 
* PHP-5.4:
  - Fixed possible NULL ptr dereference
This commit is contained in:
Felipe Pena
2013-10-20 09:04:27 -02:00
parent df31eb8fdc 52555a7894
commit 5b0560efc3
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/phar/util.c
View File

@@ -1273,8 +1273,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;
}