aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--locale/loadlocale.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 91725d5..28953a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-22 Ulrich Drepper <drepper@redhat.com>
+
+ * locale/loadlocale.c (_nl_load_locale): Fix recognition of genuine
+ mmap resource problem. Patch by Joe Landers <jlanders@vmware.com>.
+
2010-01-22 Jim Meyering <jim@meyering.net>
[BZ #11193]
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
index 6ef25b0..61e6f7f 100644
--- a/locale/loadlocale.c
+++ b/locale/loadlocale.c
@@ -224,6 +224,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
PROT_READ, MAP_FILE|MAP_COPY, fd, 0);
if (__builtin_expect (filedata == MAP_FAILED, 0))
{
+ filedata = NULL;
if (__builtin_expect (errno, ENOSYS) == ENOSYS)
{
#endif /* _POSIX_MAPPED_FILES */