com php-src: Merge branch 'PHP-5.3' into PHP-5.4: ext/fileinfo/libmagic/print.c

Commit: a8174653e33479c850342cd9f9b5e7898f52ad8d Author: Pierre Joye <pierre.php@gmail.com> Tue, 27 Mar 2012 14:02:07 +0200 Parents: 50bdc486855f450e733bc529ac0ce4f5f52ce405 d0e3289d126739ddfd72409e6ff40e7f98c14f2b Branches: PHP-5.4 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a8174653e33479c850342cd9f9b5e7898f52ad8d Log: Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: - fix test for 5.11 Fix bug #61504, potential vuln. in fileinfo. update to 5.11 Bugs: https://bugs.php.net/61504 Changed paths: MM ext/fileinfo/libmagic/print.c Diff: a8174653e33479c850342cd9f9b5e7898f52ad8d diff --combined ext/fileinfo/libmagic/print.c index 6d7945a,ef62670..8370f50 --- a/ext/fileinfo/libmagic/print.c +++ b/ext/fileinfo/libmagic/print.c @@@ -29,16 -29,15 +29,16 @@@ * print.c - debugging printout routines */ +#define _GNU_SOURCE #include "php.h" -#include "main/snprintf.h" #include "file.h" #ifndef lint - FILE_RCSID("@(#)$File: print.c,v 1.66 2009/02/03 20:27:51 christos Exp $") + FILE_RCSID("@(#)$File: print.c,v 1.71 2011/09/20 15:28:09 christos Exp $") #endif /* lint */ +#include <stdio.h> #include <string.h> #include <stdarg.h> #include <stdlib.h> @@@ -86,7 -85,7 +86,7 @@@ file_fmttime(uint32_t v, int local (void)time(&now); tm1 = localtime(&now); if (tm1 == NULL) - return "*Invalid time*"; + goto out; daylight = tm1->tm_isdst; } #endif /* HAVE_TM_ISDST */ @@@ -95,10 -94,14 +95,14 @@@ t += 3600; tm = gmtime(&t); if (tm == NULL) - return "*Invalid time*"; + goto out; pp = asctime(tm); } + if (pp == NULL) + goto out; pp[strcspn(pp, "\n")] = '\0'; return pp; + out: + return "*Invalid time*"; }