diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-09-18 15:02:10 -0700 |
|---|---|---|
| committer | Carlos O'Donell <carlos@redhat.com> | 2018-11-09 10:17:13 -0500 |
| commit | e7388e5134471ef965bd48bafc71ba71eb8bf017 (patch) | |
| tree | 68d881332016b34d71d3782c64d3bb4375a3554a | |
| parent | 9071be6b3f78da905ab2b6403933fe14d4482e47 (diff) | |
| download | glibc-e7388e5134471ef965bd48bafc71ba71eb8bf017.tar.gz glibc-e7388e5134471ef965bd48bafc71ba71eb8bf017.tar.xz glibc-e7388e5134471ef965bd48bafc71ba71eb8bf017.zip | |
Fix tzfile low-memory assertion failure
[BZ #21716] * time/tzfile.c (__tzfile_read): Check for memory exhaustion when registering time zone abbreviations. (cherry picked from commit e4e4fde51a309801af5eed72d3494cbf4b7737aa)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | time/tzfile.c | 3 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 5145768a45..788f3f41be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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-08-31 Paul Pluzhnikov <ppluzhnikov@google.com> [BZ #20271] 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 |