libs/newlib-cygwin
libs
/
newlib-cygwin
mirror of git://sourceware.org/git/newlib-cygwin.git
4
0
Fork 0
Code Issues Projects Releases Wiki Activity

strftime: use tzname if TM_ZONE is NULL 

This avoids a strlen(NULL) crash a few lines later.

* libc/time/strftime.c (strftime) <%Z>: Initialize tznam to NULL.
Use _tzname as fallback if TM_ZONE is NULL.
This commit is contained in:
Yaakov Selkowitz 2015-03-25 16:26:07 -05:00 committed by Corinna Vinschen
parent 75d5f68aab
commit 95a4fc8726
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
newlib/ChangeLog
View File

@ -1,3 +1,8 @@
2015-03-30 Yaakov Selkowitz <yselkowi@redhat.com>
* libc/time/strftime.c (strftime) <%Z>: Initialize tznam to NULL.
Use _tzname as fallback if TM_ZONE is NULL.
2015-03-30 Yaakov Selkowitz <yselkowi@redhat.com> 2015-03-30 Yaakov Selkowitz <yselkowi@redhat.com>
* libc/include/libgen.h (_BASENAME_DEFINED): Define. * libc/include/libgen.h (_BASENAME_DEFINED): Define.

6
newlib/libc/time/strftime.c
View File

@ -1311,7 +1311,7 @@ recurse:
if (tim_p->tm_isdst >= 0) if (tim_p->tm_isdst >= 0)
{ {
size_t size; size_t size;
const char *tznam; const char *tznam = NULL;
TZ_LOCK; TZ_LOCK;
#if defined (__CYGWIN__) #if defined (__CYGWIN__)
@ -1320,9 +1320,9 @@ recurse:
tznam = __cygwin_gettzname (tim_p); tznam = __cygwin_gettzname (tim_p);
#elif defined (__TM_ZONE) #elif defined (__TM_ZONE)
tznam = tim_p->__TM_ZONE; tznam = tim_p->__TM_ZONE;
#else
tznam = _tzname[tim_p->tm_isdst > 0];
#endif #endif
if (!tznam)
tznam = _tzname[tim_p->tm_isdst > 0];
/* Note that in case of wcsftime this loop only works for /* Note that in case of wcsftime this loop only works for
timezone abbreviations using the portable codeset (aka ASCII). timezone abbreviations using the portable codeset (aka ASCII).
This seems to be the case, but if that ever changes, this This seems to be the case, but if that ever changes, this