qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Don't crash in iconv setup when getcwd fails.

This commit is contained in:
Roland McGrath 2015-02-25 15:41:31 -08:00
parent d68eba500c
commit d19df6ac5a
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2015-02-25 Roland McGrath <roland@hack.frob.com>
* iconv/gconv_conf.c (__gconv_get_path): Don't crash if __getcwd
returns a null pointer.
2015-02-25 Adhemerval Zanella <azanella@linux.vnet.ibm.com> 2015-02-25 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c: Define memcpy * sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c: Define memcpy

2
iconv/gconv_conf.c
View File

@ -468,7 +468,7 @@ __gconv_get_path (void)
":", 1), ":", 1),
default_gconv_path, sizeof (default_gconv_path)); default_gconv_path, sizeof (default_gconv_path));
cwd = __getcwd (NULL, 0); cwd = __getcwd (NULL, 0);
cwdlen = strlen (cwd); cwdlen = __glibc_unlikely (cwd == NULL) ? 0 : strlen (cwd);
} }
assert (default_gconv_path[0] == '/'); assert (default_gconv_path[0] == '/');