From d19df6ac5ace81ca8412f8bf160ae63f44f6f0cf Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 25 Feb 2015 15:41:31 -0800 Subject: Don't crash in iconv setup when getcwd fails. --- ChangeLog | 5 +++++ iconv/gconv_conf.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index bf23bc139c..d35a29b926 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-02-25 Roland McGrath + + * iconv/gconv_conf.c (__gconv_get_path): Don't crash if __getcwd + returns a null pointer. + 2015-02-25 Adhemerval Zanella * sysdeps/powerpc/powerpc64/multiarch/memmove-ppc64.c: Define memcpy diff --git a/iconv/gconv_conf.c b/iconv/gconv_conf.c index ee5e6e499c..0ba4739c41 100644 --- a/iconv/gconv_conf.c +++ b/iconv/gconv_conf.c @@ -468,7 +468,7 @@ __gconv_get_path (void) ":", 1), default_gconv_path, sizeof (default_gconv_path)); cwd = __getcwd (NULL, 0); - cwdlen = strlen (cwd); + cwdlen = __glibc_unlikely (cwd == NULL) ? 0 : strlen (cwd); } assert (default_gconv_path[0] == '/'); -- cgit v1.2.1