diff options
| author | Pierre Joye <pajoye@php.net> | 2010-02-01 20:56:03 +0000 |
|---|---|---|
| committer | Pierre Joye <pajoye@php.net> | 2010-02-01 20:56:03 +0000 |
| commit | 3ef47217d7b96a92de3497859f246b6de04681e8 (patch) | |
| tree | b079a7be47aeeace142ae29d9d24b53675fa9529 /ext/zip/lib/zip_close.c | |
| parent | fa197ab9cc2ebc6c47bb26299cc5a0035e0b772f (diff) | |
| download | php-git-3ef47217d7b96a92de3497859f246b6de04681e8.tar.gz | |
- update to 0.9.3
Diffstat (limited to 'ext/zip/lib/zip_close.c')
| -rw-r--r-- | ext/zip/lib/zip_close.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/zip/lib/zip_close.c b/ext/zip/lib/zip_close.c index 982ee855f2..0796f27462 100644 --- a/ext/zip/lib/zip_close.c +++ b/ext/zip/lib/zip_close.c @@ -193,7 +193,8 @@ zip_close(struct zip *za) error = 1; break; } - if (_zip_dirent_read(&de, za->zp, NULL, 0, 1, &za->error) != 0) { + if (_zip_dirent_read(&de, za->zp, NULL, NULL, 1, + &za->error) != 0) { error = 1; break; } @@ -265,6 +266,8 @@ zip_close(struct zip *za) _zip_dirent_finalize(&de); } + free(filelist); + if (!error) { if (write_cdir(za, cd, out) < 0) error = 1; @@ -307,6 +310,8 @@ zip_close(struct zip *za) mask = umask(0); umask(mask); chmod(za->zn, 0666&~mask); + if (za->ch_comment) + free(za->ch_comment); _zip_free(za); free(temp); @@ -444,6 +449,7 @@ add_data_uncomp(struct zip *za, zip_source_callback cb, void *ud, zstr.next_out = (Bytef *)b2; zstr.avail_out = sizeof(b2); + zstr.next_in = NULL; zstr.avail_in = 0; flush = 0; |