diff --git a/ChangeLog b/ChangeLog index 72c681371..c81087aa6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-10-26 Pascal Terjan + + * glib/libcharset/localcharset.c: Fix small leak on failed + realloc in _g_locale_get_charset_aliases (#338582) + 2006-10-16 Behdad Esfahbod * glib/gnulib/Makefile.am: Add $(GLIB_DEBUG_FLAGS). (#362543, diff --git a/glib/libcharset/localcharset.c b/glib/libcharset/localcharset.c index 2b799b8f8..eaa997e28 100644 --- a/glib/libcharset/localcharset.c +++ b/glib/libcharset/localcharset.c @@ -183,8 +183,12 @@ _g_locale_get_charset_aliases (void) } else { + char * p = res_ptr; res_size += l1 + 1 + l2 + 1; res_ptr = (char *) realloc (res_ptr, res_size + 1); + if (res_ptr == NULL) { + free(p); + } } if (res_ptr == NULL) {