diff options
| author | Nuno Lopes <nlopess@php.net> | 2006-11-11 23:43:00 +0000 |
|---|---|---|
| committer | Nuno Lopes <nlopess@php.net> | 2006-11-11 23:43:00 +0000 |
| commit | 232bb79bedd276d5a1510ad849e952a056a08c05 (patch) | |
| tree | 80f0a6cd681946b1e7a1ebf7ef63f22f894a0123 /ext/zip/php_zip.c | |
| parent | b3de830b613d238920490a58b87a2414094f13b6 (diff) | |
| download | php-git-232bb79bedd276d5a1510ad849e952a056a08c05.tar.gz | |
fix leaks within zip entries in several tests
Diffstat (limited to 'ext/zip/php_zip.c')
| -rw-r--r-- | ext/zip/php_zip.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ext/zip/php_zip.c b/ext/zip/php_zip.c index d77bdb6787..03c13ddc78 100644 --- a/ext/zip/php_zip.c +++ b/ext/zip/php_zip.c @@ -551,6 +551,7 @@ static void php_zip_free_dir(zend_rsrc_list_entry *rsrc TSRMLS_DC) if (zip_int) { if (zip_int->za) { zip_close(zip_int->za); + zip_int->za = NULL; } efree(rsrc->ptr); @@ -565,8 +566,14 @@ static void php_zip_free_entry(zend_rsrc_list_entry *rsrc TSRMLS_DC) { zip_read_rsrc *zr_rsrc = (zip_read_rsrc *) rsrc->ptr; - efree(zr_rsrc); - rsrc->ptr = NULL; + if (zr_rsrc) { + if (zr_rsrc->zf) { + zip_fclose(zr_rsrc->zf); + zr_rsrc->zf = NULL; + } + efree(zr_rsrc); + rsrc->ptr = NULL; + } } /* }}} */ |