summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/cygwin/ChangeLog4
-rw-r--r--winsup/cygwin/localtime.cc2
2 files changed, 5 insertions, 1 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 4c5ecf982..40656fcda 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,5 +1,9 @@
2014-06-23 Corinna Vinschen <corinna@vinschen.de>
+ * localtime.cc (tzload): Fix leaking memory (CID 60001).
+
+2014-06-23 Corinna Vinschen <corinna@vinschen.de>
+
* exceptions.cc (try_to_debug): Free environment pointer when not used
anymore (CID 59968).
diff --git a/winsup/cygwin/localtime.cc b/winsup/cygwin/localtime.cc
index 29371703e..139faced8 100644
--- a/winsup/cygwin/localtime.cc
+++ b/winsup/cygwin/localtime.cc
@@ -698,7 +698,7 @@ tzload(timezone_t sp, const char *name, const int doextend)
else
base = name;
if (strcmp(base, "posixrules"))
- return -1;
+ goto oops;
/* We've got a built-in copy of posixrules just in case */
fid = -2;