From: Arjun Shankar <arjun@redhat.com>
Date: Mon, 5 Nov 2018 14:45:07 +0000 (+0100)
Subject: Unconditionally call __gconv_get_path when reading iconv configuration
X-Git-Tag: glibc-2.29~333
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d6ee04622fd77908936250b1f632c2b4388ee78;p=thirdparty%2Fglibc.git

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.
---

diff --git a/ChangeLog b/ChangeLog
index 5268012d249..d7ee676cf8c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-05  Arjun Shankar  <arjun@redhat.com>
+
+	* 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  <schwab@suse.de>
 
 	[BZ #22927]
diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c
index 78010491e6e..2b73dd8f459 100644
--- a/iconv/gconv_conf.c
+++ b/iconv/gconv_conf.c
@@ -552,8 +552,7 @@ __gconv_read_conf (void)
 
 #ifndef STATIC_GCONV
   /* Find out where we have to look.  */
-  if (__gconv_path_elem == NULL)
-    __gconv_get_path ();
+  __gconv_get_path ();
 
   for (cnt = 0; __gconv_path_elem[cnt].name != NULL; ++cnt)
     {