RepoMirrors
/
musl
mirror of git://git.musl-libc.org/musl
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor fix to tz name checking 

if a zoneinfo file is not (or is no longer) in use, don't check the
abbrevs pointers, which may be invalid.
This commit is contained in:
Rich Felker 2013-08-24 13:10:01 -04:00
parent d78be392e1
commit 32985d4f63
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/time/__tz.c
View File

@ -395,8 +395,8 @@ const char *__tm_to_tzname(const struct tm *tm)
const void *p = tm->__tm_zone; const void *p = tm->__tm_zone;
LOCK(lock); LOCK(lock);
do_tzset(); do_tzset();
if (p != __gmt && p != __tzname[0] && p != __tzname[1] if (p != __gmt && p != __tzname[0] && p != __tzname[1] &&
&& (uintptr_t)p-(uintptr_t)abbrevs >= abbrevs_end - abbrevs) (!zi || (uintptr_t)p-(uintptr_t)abbrevs >= abbrevs_end - abbrevs))
p = ""; p = "";
UNLOCK(lock); UNLOCK(lock);
return p; return p;