diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2018-09-18 15:02:11 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2018-09-18 15:09:01 -0700 |
| commit | dab9c3488e86d5304f3e4b778933760374494a82 (patch) | |
| tree | c13bb52e61f1ea6872f482479d72f0edc8560ffc | |
| parent | e4e4fde51a309801af5eed72d3494cbf4b7737aa (diff) | |
| download | glibc-dab9c3488e86d5304f3e4b778933760374494a82.tar.gz glibc-dab9c3488e86d5304f3e4b778933760374494a82.tar.xz glibc-dab9c3488e86d5304f3e4b778933760374494a82.zip | |
Simplify tzfile fstat failure code
[BZ #21716] * time/tzfile.c (__tzfile_read): Simplify slightly.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | time/tzfile.c | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 5d8c035390..0be5afdaa0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2018-09-18 Paul Eggert <eggert@cs.ucla.edu> + Simplify tzfile fstat failure code + [BZ #21716] + * time/tzfile.c (__tzfile_read): Simplify slightly. + Fix tzfile low-memory assertion failure [BZ #21716] * time/tzfile.c (__tzfile_read): Check for memory exhaustion diff --git a/time/tzfile.c b/time/tzfile.c index ea6e940303..72ef75f074 100644 --- a/time/tzfile.c +++ b/time/tzfile.c @@ -168,10 +168,7 @@ __tzfile_read (const char *file, size_t extra, char **extrap) /* Get information about the file we are actually using. */ if (fstat64 (__fileno (f), &st) != 0) - { - fclose (f); - goto ret_free_transitions; - } + goto lose; free ((void *) transitions); transitions = NULL; |