php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-02 05:32:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-5.5'

Browse Source 
* PHP-5.5:
  updated NEWS
  updated NEWS
  Fixed bug #64452 Zip PHPTs crash intermittently
This commit is contained in:
Anatol Belski
2013-03-20 09:15:46 +01:00
parent b5a7675836 bf8026aacf
commit 7daabc42a2
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/zip/lib/zip_close.c
View File

@@ -88,6 +88,9 @@ zip_close(struct zip *za)
if (za == NULL)
return -1;
if (za->zp == NULL)
return -1;
if (!_zip_changed(za, &survivors)) {
_zip_free(za);
return 0;
@@ -164,9 +167,10 @@ zip_close(struct zip *za)
for (j=0; j<survivors; j++) {
i = filelist[j].idx;
_zip_dirent_init(&de);
/* create new local directory entry */
if (ZIP_ENTRY_DATA_CHANGED(za->entry+i) || new_torrentzip) {
_zip_dirent_init(&de);
if (zip_get_archive_flag(za, ZIP_AFL_TORRENT, 0))
_zip_dirent_torrent_normalize(&de);

12
ext/zip/lib/zip_dirent.c
View File

@@ -157,11 +157,17 @@ _zip_cdir_write(struct zip_cdir *cd, FILE *fp, struct zip_error *error)
void
_zip_dirent_finalize(struct zip_dirent *zde)
{
free(zde->filename);
if (zde->filename_len > 0) {
free(zde->filename);
}
zde->filename = NULL;
free(zde->extrafield);
if (zde->extrafield_len > 0) {
free(zde->extrafield);
}
zde->extrafield = NULL;
free(zde->comment);
if (zde->comment_len > 0) {
free(zde->comment);
}
zde->comment = NULL;
}