GNU C Library master sources branch master updated. glibc-2.28.9000-260-g6d6ee04

arjun@sourceware.org arjun@sourceware.org
Mon Nov 5 14:46:00 GMT 2018


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  6d6ee04622fd77908936250b1f632c2b4388ee78 (commit)
      from  bd3b0fbae33a9a4cc5e2daf049443d5cf03d4251 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=6d6ee04622fd77908936250b1f632c2b4388ee78

commit 6d6ee04622fd77908936250b1f632c2b4388ee78
Author: Arjun Shankar <arjun@redhat.com>
Date:   Mon Nov 5 15:45:07 2018 +0100

    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 5268012..d7ee676 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 7801049..2b73dd8 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)
     {

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog          |    5 +++++
 iconv/gconv_conf.c |    3 +--
 2 files changed, 6 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources



More information about the Glibc-cvs mailing list