felipe                                   Tue, 11 Jan 2011 20:55:06 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=307385

Log:
- Fixed bug #53568 (swapped memset arguments in struct initialization) 
[backported]

Bug: http://bugs.php.net/53568 (Closed) swapped memset arguments in 
ext/zip/lib/zip_dirent.c
      
Changed paths:
    U   php/php-src/branches/PHP_5_2/NEWS
    U   php/php-src/branches/PHP_5_2/ext/zip/lib/zip_dirent.c

Modified: php/php-src/branches/PHP_5_2/NEWS
===================================================================
--- php/php-src/branches/PHP_5_2/NEWS   2011-01-11 19:09:09 UTC (rev 307384)
+++ php/php-src/branches/PHP_5_2/NEWS   2011-01-11 20:55:06 UTC (rev 307385)
@@ -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,

Modified: php/php-src/branches/PHP_5_2/ext/zip/lib/zip_dirent.c
===================================================================
--- php/php-src/branches/PHP_5_2/ext/zip/lib/zip_dirent.c       2011-01-11 
19:09:09 UTC (rev 307384)
+++ php/php-src/branches/PHP_5_2/ext/zip/lib/zip_dirent.c       2011-01-11 
20:55:06 UTC (rev 307385)
@@ -473,9 +473,7 @@
 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;

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to