From 6d6ee04622fd77908936250b1f632c2b4388ee78 Mon Sep 17 00:00:00 2001 From: Arjun Shankar Date: Mon, 5 Nov 2018 15:45:07 +0100 Subject: Unconditionally call __gconv_get_path when reading iconv configuration __gconv_read_conf is only ever called once during the program's lifetime. This means that __gconv_path_elem is always uninitialized when the function begins executing. __gconv_get_path has an assert to ensure that this expected runtime behaviour is always exhibited. Given this, checking for a NULL value before calling __gconv_get_path is unnecessary. This commit drops the condition and calls __gconv_get_path unconditionally. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ChangeLog') diff --git a/ChangeLog b/ChangeLog index 5268012d24..d7ee676cf8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-11-05 Arjun Shankar + + * iconv/gconv_conf.c (__gconv_read_conf): Remove NULL check for + __gconv_path_elem and call __gconv_get_path unconditionally. + 2018-11-05 Andreas Schwab [BZ #22927] -- cgit 1.4.1