mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-02-17 13:00:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

gconv: Use 64-bit interfaces in gconv_parseconfdir (bug 29583)

Browse Source 
It's possible that inode numbers are outside the 32-bit range.
The existing code only handles the in-libc case correctly, and
still uses the legacy interfaces when building iconv.

Suggested-by: Helge Deller <deller@gmx.de>
(cherry picked from commit f97905f246)
This commit is contained in:
Florian Weimer 2022-09-20 12:12:43 +02:00
parent 2ff6775ad3
commit f50a6c843a
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -117,6 +117,7 @@ The following bugs are resolved with this release:
[29446] _dlopen now ignores dl_caller argument in static mode [29446] _dlopen now ignores dl_caller argument in static mode
[29490] alpha: New __brk_call implementation is broken [29490] alpha: New __brk_call implementation is broken
[29528] elf: Call __libc_early_init for reused namespaces [29528] elf: Call __libc_early_init for reused namespaces
[29583] Use 64-bit interfaces in gconv_parseconfdir
Version 2.34 Version 2.34

16
iconv/gconv_parseconfdir.h
View File

@ -29,14 +29,14 @@
# define isspace(__c) __isspace_l ((__c), _nl_C_locobj_ptr) # define isspace(__c) __isspace_l ((__c), _nl_C_locobj_ptr)
# define asprintf __asprintf # define asprintf __asprintf
# define opendir __opendir # define opendir __opendir
# define readdir __readdir # define readdir64 __readdir64
# define closedir __closedir # define closedir __closedir
# define mempcpy __mempcpy # define mempcpy __mempcpy
# define struct_stat struct __stat64_t64 # define struct_stat64 struct __stat64_t64
# define lstat __lstat64_time64 # define lstat64 __lstat64_time64
# define feof_unlocked __feof_unlocked # define feof_unlocked __feof_unlocked
#else #else
# define struct_stat struct stat # define struct_stat64 struct stat64
#endif #endif
/* Name of the file containing the module information in the directories /* Name of the file containing the module information in the directories
@ -148,8 +148,8 @@ gconv_parseconfdir (const char *prefix, const char *dir, size_t dir_len)
DIR *confdir = opendir (buf); DIR *confdir = opendir (buf);
if (confdir != NULL) if (confdir != NULL)
{ {
struct dirent *ent; struct dirent64 *ent;
while ((ent = readdir (confdir)) != NULL) while ((ent = readdir64 (confdir)) != NULL)
{ {
if (ent->d_type != DT_REG && ent->d_type != DT_UNKNOWN) if (ent->d_type != DT_REG && ent->d_type != DT_UNKNOWN)
continue; continue;
@ -161,12 +161,12 @@ gconv_parseconfdir (const char *prefix, const char *dir, size_t dir_len)
&& strcmp (ent->d_name + len - strlen (suffix), suffix) == 0) && strcmp (ent->d_name + len - strlen (suffix), suffix) == 0)
{ {
char *conf; char *conf;
struct_stat st; struct_stat64 st;
if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0) if (asprintf (&conf, "%s/%s", buf, ent->d_name) < 0)
continue; continue;
if (ent->d_type != DT_UNKNOWN if (ent->d_type != DT_UNKNOWN
|| (lstat (conf, &st) != -1 && S_ISREG (st.st_mode))) || (lstat64 (conf, &st) != -1 && S_ISREG (st.st_mode)))
found |= read_conf_file (conf, dir, dir_len); found |= read_conf_file (conf, dir, dir_len);
free (conf); free (conf);