diff options
| author | Felipe Pena <felipe@php.net> | 2011-01-11 20:55:06 +0000 |
|---|---|---|
| committer | Felipe Pena <felipe@php.net> | 2011-01-11 20:55:06 +0000 |
| commit | b85380f7d02d811c67fc64eb67bdc3da1d095d9b (patch) | |
| tree | 62ca0b8574ff93d3412ca883104e68546ae12449 | |
| parent | 92f7256ef1ba52c5c021efb72bc90fa190879402 (diff) | |
| download | php-git-b85380f7d02d811c67fc64eb67bdc3da1d095d9b.tar.gz | |
- Fixed bug #53568 (swapped memset arguments in struct initialization) [backported]
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | ext/zip/lib/zip_dirent.c | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -2,6 +2,8 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ?? ??? ????, PHP 5.2.18 - Fixed bug #53682 (Fix compile on the VAX). (Rasmus, jklos) +- Fixed bug #53568 (swapped memset arguments in struct initialization). + (crrodriguez at opensuse dot org) 06 Jan 2010, PHP 5.2.17 - Fixed Bug #53632 (infinite loop with x87 fpu). (CVE-2010-4645) (Scott, diff --git a/ext/zip/lib/zip_dirent.c b/ext/zip/lib/zip_dirent.c index 39fcb6f62d..28cc2005d7 100644 --- a/ext/zip/lib/zip_dirent.c +++ b/ext/zip/lib/zip_dirent.c @@ -473,9 +473,7 @@ _zip_dirent_write(struct zip_dirent *zde, FILE *fp, int localp, static time_t _zip_d2u_time(int dtime, int ddate) { - struct tm tm; - - memset(&tm, sizeof(tm), 0); + struct tm tm = {0}; /* let mktime decide if DST is in effect */ tm.tm_isdst = -1; |