diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-09-18 15:02:10 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-09-18 15:09:01 -0700 |
| commit | e4e4fde51a309801af5eed72d3494cbf4b7737aa (patch) | |
| tree | 40315a0935e9b7a4bd564eb6a8f2bc3885e5c61e | |
| parent | d3a43e49f342c4663af0fff9d95000cfe26867c3 (diff) | |
| download | glibc-e4e4fde51a309801af5eed72d3494cbf4b7737aa.tar glibc-e4e4fde51a309801af5eed72d3494cbf4b7737aa.tar.gz glibc-e4e4fde51a309801af5eed72d3494cbf4b7737aa.tar.bz2 glibc-e4e4fde51a309801af5eed72d3494cbf4b7737aa.zip | |
Fix tzfile low-memory assertion failure
[BZ #21716]
* time/tzfile.c (__tzfile_read): Check for memory exhaustion
when registering time zone abbreviations.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | time/tzfile.c | 3 |
2 files changed, 9 insertions, 1 deletions
@@ -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. diff --git a/time/tzfile.c b/time/tzfile.c index 2a385b92bc..ea6e940303 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -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 |