aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--time/tzfile.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 5d8c035..0be5afd 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 ea6e940..72ef75f 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;