- Fixed bug #53568 (swapped memset arguments in struct initialization).

diff --git a/NEWS b/NEWS
index 62f758123d1ff95a0f66267abb33c0bf4b231faf..b51bc350b57cf1f0bff0d128b8ab7f78ecd5f04e 100644 (file)
--- 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 39fcb6f62d6ed32612804b9b6a4b1f52447edeb2..59f8ab0af9c6c5ace52c863526e66e0d7e7928c5 100644 (file)
--- 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;