From de2139a9f25d8f7fb76f260fe7cc86ffd736a5d9 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Fri, 7 Sep 2012 14:14:08 -0700 Subject: Check if deriv->steps is NULL before freeing it --- ChangeLog | 3 +++ iconv/gconv_db.c | 9 ++++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d3823ec78..77ae95cff6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2012-09-07 H.J. Lu + * 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 a081205106..5bc7ff8bd0 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); } -- cgit 1.4.1