AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-21 20:40:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Unconditionally call __gconv_get_path when reading iconv configuration

Browse Source 
__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.
This commit is contained in:
Arjun Shankar 2018-11-05 15:45:07 +01:00
parent bd3b0fbae3
commit 6d6ee04622
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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]

3
iconv/gconv_conf.c
View File

@ -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)
{