aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-09-07 14:14:08 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-09-07 14:14:08 -0700
commitde2139a9f25d8f7fb76f260fe7cc86ffd736a5d9 (patch)
tree409489d11b7de23dbee2553f18e89056764071ef
parent5ca78dd02444d7a19d676d5c6aca9e0837f1b791 (diff)
downloadglibc-de2139a9f25d8f7fb76f260fe7cc86ffd736a5d9.zip
glibc-de2139a9f25d8f7fb76f260fe7cc86ffd736a5d9.tar.gz
glibc-de2139a9f25d8f7fb76f260fe7cc86ffd736a5d9.tar.bz2
Check if deriv->steps is NULL before freeing it
-rw-r--r--ChangeLog3
-rw-r--r--iconv/gconv_db.c9
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 6d3823e..77ae95c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-09-07 H.J. Lu <hongjiu.lu@intel.com>
+ * iconv/gconv_db.c (free_derivation): Check if deriv->steps
+ is NULL.
+
* debug/Makefile (LDFLAGS-tst-chk4): Renamed to ...
(LDLIBS-tst-chk4): This.
(LDFLAGS-tst-chk5): Renamed to ...
diff --git a/iconv/gconv_db.c b/iconv/gconv_db.c
index a081205..5bc7ff8 100644
--- a/iconv/gconv_db.c
+++ b/iconv/gconv_db.c
@@ -193,10 +193,13 @@ free_derivation (void *p)
}
/* Free the name strings. */
- free ((char *) deriv->steps[0].__from_name);
- free ((char *) deriv->steps[deriv->nsteps - 1].__to_name);
+ if (deriv->steps != NULL)
+ {
+ free ((char *) deriv->steps[0].__from_name);
+ free ((char *) deriv->steps[deriv->nsteps - 1].__to_name);
+ free ((struct __gconv_step *) deriv->steps);
+ }
- free ((struct __gconv_step *) deriv->steps);
free (deriv);
}