archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

fix a few memleaks and double-free()s on error conditions

Browse source
This commit is contained in:
Nuno Lopes 2007-01-06 20:16:25 +00:00
parent 9b253882fc
commit 3eaf46af3e
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ext/zip/php_zip.c
View file

@ -551,7 +551,9 @@ static void php_zip_free_dir(zend_rsrc_list_entry *rsrc TSRMLS_DC)
if (zip_int) { if (zip_int) {
if (zip_int->za) { if (zip_int->za) {
zip_close(zip_int->za); if (zip_close(zip_int->za) != 0) {
_zip_free(zip_int->za);
}
zip_int->za = NULL; zip_int->za = NULL;
} }
@ -906,16 +908,20 @@ static ZIPARCHIVE_METHOD(open)
if (ze_obj->za) { if (ze_obj->za) {
/* we already have an opened zip, free it */ /* we already have an opened zip, free it */
zip_close(ze_obj->za); if (zip_close(ze_obj->za) != 0) {
_zip_free(ze_obj->za);
}
ze_obj->za = NULL;
} }
if (ze_obj->filename) { if (ze_obj->filename) {
efree(ze_obj->filename); efree(ze_obj->filename);
ze_obj->filename = NULL;
} }
intern = zip_open(resolved_path, flags, &err); intern = zip_open(resolved_path, flags, &err);
if (!intern || err) { if (!intern || err) {
RETURN_LONG((long)err); RETURN_LONG((long)err);
} }
ze_obj->filename = estrndup(resolved_path, strlen(resolved_path)); ze_obj->filename = estrdup(resolved_path);
ze_obj->filename_len = filename_len; ze_obj->filename_len = filename_len;
ze_obj->za = intern; ze_obj->za = intern;
RETURN_TRUE; RETURN_TRUE;