]> granicus.if.org Git - php/commitdiff
MFB: fix swapping of time/date in timestamp saving for zip, which can cause crash...
authorGreg Beaver <cellog@php.net>
Sun, 1 Mar 2009 06:58:23 +0000 (06:58 +0000)
committerGreg Beaver <cellog@php.net>
Sun, 1 Mar 2009 06:58:23 +0000 (06:58 +0000)
ext/phar/zip.c

index 71a35b11d6952af6dcbe91b6191666ac85884b1e..1409b652485266d136bee6f1ffba4dc8bf3ee6de 100644 (file)
@@ -147,8 +147,8 @@ static void phar_zip_u2d_time(time_t time, char *dtime, char *ddate) /* {{{ */
        struct tm *tm, tmbuf;
 
        tm = php_localtime_r(&time, &tmbuf);
-       ctime = ((tm->tm_year+1900-1980)<<9) + ((tm->tm_mon+1)<<5) + tm->tm_mday;
-       cdate = ((tm->tm_hour)<<11) + ((tm->tm_min)<<5) + ((tm->tm_sec)>>1);
+       cdate = ((tm->tm_year+1900-1980)<<9) + ((tm->tm_mon+1)<<5) + tm->tm_mday;
+       ctime = ((tm->tm_hour)<<11) + ((tm->tm_min)<<5) + ((tm->tm_sec)>>1);
        PHAR_SET_16(dtime, ctime);
        PHAR_SET_16(ddate, cdate);
 }