mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-04-12 14:21:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

iconv: Use 64 bit stat for gconv_parseconfdir (BZ# 29213)

Browse Source 
The issue is only when used within libc.so (iconvconfig already builds
with _TIME_SIZE=64).

This is a missing spot initially from 52a5fe70a2c77935.

Checked on i686-linux-gnu.

(cherry picked from commit c789e6e40974e2b67bd33a17f29b20dce6ae8822)
This commit is contained in:
Adhemerval Zanella 2022-05-31 12:51:43 -03:00
parent c5a75ecec8
commit d7d1eebd4d
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -39,6 +39,7 @@ The following bugs are resolved with this release:
[29209] libc: isfdtype is not y2038 aware
[29210] network: ruserpass is not y2038 aware
[29211] libc: __open_catalog is not y2038 aware
[29213] libc: gconv_parseconfdir is not y2038 aware
Version 2.35

9
iconv/gconv_parseconfdir.h
View File

@ -32,8 +32,11 @@
# define readdir __readdir
# define closedir __closedir
# define mempcpy __mempcpy
# define lstat64 __lstat64
# define struct_stat struct __stat64_t64
# define lstat __lstat64_time64
# define feof_unlocked __feof_unlocked
#else
# define struct_stat struct stat
#endif
/* Name of the file containing the module information in the directories
@ -158,12 +161,12 @@ gconv_parseconfdir (const char *prefix, const char *dir, size_t dir_len)
&& strcmp (ent->d_name + len - strlen (suffix), suffix) == 0)
{
char *conf;
struct stat64 st;
struct_stat st;
if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0)
continue;
if (ent->d_type != DT_UNKNOWN
|| (lstat64 (conf, &st) != -1 && S_ISREG (st.st_mode)))
|| (lstat (conf, &st) != -1 && S_ISREG (st.st_mode)))
found |= read_conf_file (conf, dir, dir_len);
free (conf);