summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorinna Vinschen <corinna@vinschen.de>2014-06-23 13:38:06 +0000
committerCorinna Vinschen <corinna@vinschen.de>2014-06-23 13:38:06 +0000
commit28b4c8483efc8b3c4f2860a590e719445e5daf36 (patch)
tree89f02b116ee3460b14a85e3677c5881ce19ef474
parent4337e28e6218bd0f924536998681d2f1da3db98e (diff)
downloadcygnal-28b4c8483efc8b3c4f2860a590e719445e5daf36.tar.gz
cygnal-28b4c8483efc8b3c4f2860a590e719445e5daf36.tar.bz2
cygnal-28b4c8483efc8b3c4f2860a590e719445e5daf36.zip
* localtime.cc (tzload): Fix leaking memory (CID 60001).
-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;