aboutsummaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorFlorian Weimer <fweimer@redhat.com>2017-08-29 17:33:58 +0200
committerFlorian Weimer <fweimer@redhat.com>2017-08-29 17:33:58 +0200
commit251bccfa1fcb3568e43546b0df33e052889406c1 (patch)
tree29c7966c2fc0ee4fba8cbf1ddf42123a71b0716e /ChangeLog
parente7c18b9d0aacb02f9d6edffdf4d1e26a54fbfb84 (diff)
downloadglibc-251bccfa1fcb3568e43546b0df33e052889406c1.tar.xz
glibc-251bccfa1fcb3568e43546b0df33e052889406c1.zip
iconv_open: Fix heap corruption on gconv_init failure [BZ #22026]
Also mangle the __end_fct function pointer on the error handling path.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog16
1 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1efd7f5a4c..bf89b59a55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
2017-08-29 Florian Weimer <fweimer@redhat.com>
+ [BZ #22026]
+ * iconv/gconv_db.c (gen_steps): Decrement step_cnt after resetting
+ __end_fct. Mangle __end_fct after setting it to NULL.
+ * iconv/Makefile (tests): Add tst-gconv-init-failure.
+ (modules-names, modules-names-tests): Add
+ tst-gconv-init-failure-mod.
+ (gconv-modules): New target.
+ (tst-gconv-init-failure-mod.so): Link against libsupport.
+ (tst-gconv-init-failure): Depend on gconv-modules,
+ tst-gconv-init-failure-mod.so.
+ * iconv/tst-gconv-init-failure-mod.c: New file.
+ * iconv/tst-gconv-init-failure.c: Likewise.
+ * iconv/test-gconv-modules: Likewise.
+
+2017-08-29 Florian Weimer <fweimer@redhat.com>
+
[BZ #22025]
* iconv/gconv_db.c (free_derivation): Remove redundant
parentheses.