OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix tzfile low-memory assertion failure 

[BZ #21716]
* time/tzfile.c (__tzfile_read): Check for memory exhaustion
when registering time zone abbreviations.
This commit is contained in:
Paul Eggert 2018-09-18 15:02:10 -07:00
parent d3a43e49f3
commit e4e4fde51a
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2018-09-18 Paul Eggert <eggert@cs.ucla.edu>
Fix tzfile low-memory assertion failure
[BZ #21716]
* time/tzfile.c (__tzfile_read): Check for memory exhaustion
when registering time zone abbreviations.
2018-09-18 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/bits/mman.h: New file.

3
time/tzfile.c
View File

@ -410,7 +410,8 @@ __tzfile_read (const char *file, size_t extra, char **extrap)
/* First "register" all timezone names. */
for (i = 0; i < num_types; ++i)
(void) __tzstring (&zone_names[types[i].idx]);
if (__tzstring (&zone_names[types[i].idx]) == NULL)
goto ret_free_transitions;
/* Find the standard and daylight time offsets used by the rule file.
We choose the offsets in the types of each flavor that are