summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS4
-rw-r--r--ext/zip/lib/zip_dirent.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index 62f758123d..b51bc350b5 100644
--- a/NEWS
+++ b/NEWS
@@ -64,6 +64,10 @@
- Streams:
. Implemented FR #26158 (open arbitrary file descriptor with fopen). (Gustavo)
+- Zip extension
+ . Fixed bug #53568 (swapped memset arguments in struct initialization).
+ (crrodriguez at opensuse dot org)
+
09 Dec 2010, PHP 5.3.4
- Upgraded bundled Sqlite3 to version 3.7.3. (Ilia)
diff --git a/ext/zip/lib/zip_dirent.c b/ext/zip/lib/zip_dirent.c
index 39fcb6f62d..59f8ab0af9 100644
--- a/ext/zip/lib/zip_dirent.c
+++ b/ext/zip/lib/zip_dirent.c
@@ -473,10 +473,8 @@ _zip_dirent_write(struct zip_dirent *zde, FILE *fp, int localp,
static time_t
_zip_d2u_time(int dtime, int ddate)
{
- struct tm tm;
+ struct tm tm = {0};
- memset(&tm, sizeof(tm), 0);
-
/* let mktime decide if DST is in effect */
tm.tm_isdst = -1;