[glibc/f17] Resolves: #827510 - Delay setting DECIDED field in locale file structure until we have read the file

[Patsy Franklin]

commit c34fcc86a933b49cc2fb613c5a00e50d995155dd
Author: Patsy Franklin <pfrankli at redhat.com>
Date:   Fri Jun 15 12:46:16 2012 -0400

    Resolves: #827510
    - Delay setting DECIDED field in locale file structure until we have read the file's data (#827510)

 glibc-rh827510.patch |   27 +++++++++++++++++++++++++++
 glibc.spec           |   10 +++++++++-
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/glibc-rh827510.patch b/glibc-rh827510.patch
new file mode 100644
index 0000000..f5f024c
--- /dev/null
+++ b/glibc-rh827510.patch
@@ -0,0 +1,27 @@
+2012-06-14  Jeff Law  <law at redhat.com>
+
+
+	* locale/loadlocale.c (_nl_load_locale): Delay setting
+	file->decided until we have successfully loaded the file's
+	data.
+
+diff --git a/locale/loadlocale.c b/locale/loadlocale.c
+index e3fa187..9fd9216 100644
+--- a/locale/loadlocale.c
++++ b/locale/loadlocale.c
+@@ -169,7 +169,6 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
+   int save_err;
+   int alloc = ld_mapped;
+ 
+-  file->decided = 1;
+   file->data = NULL;
+ 
+   fd = open_not_cancel_2 (file->filename, O_RDONLY | O_CLOEXEC);
+@@ -278,6 +277,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
+   newdata->alloc = alloc;
+ 
+   file->data = newdata;
++  file->decided = 1;
+ }
+ 
+ void
diff --git a/glibc.spec b/glibc.spec
index c28c9ad..de9647c 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -28,7 +28,7 @@
 Summary: The GNU libc libraries
 Name: glibc
 Version: %{glibcversion}
-Release: 46%{?dist}
+Release: 47%{?dist}
 # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
 # Things that are linked directly into dynamically linked programs
 # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional
@@ -210,6 +210,9 @@ Patch2059: %{name}-rh767693-2.patch
 # Upstream BZ 13027
 Patch2060: %{name}-rh804630.patch
 
+# Upstream BZ 14247
+Patch2061: %{name}-rh827510.patch
+
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Obsoletes: glibc-profile < 2.4
 Obsoletes: nss_db
@@ -498,6 +501,7 @@ popd
 %patch2059 -p1
 %patch2060 -p1
 %patch0061 -p1
+%patch2061 -p1
 
 # A lot of programs still misuse memcpy when they have to use
 # memmove. The memcpy implementation below is not tolerant at
@@ -1364,6 +1368,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Fri Jun 15 2012 Patsy Franklin <pfrankli at redhat.com> - 2.15.47
+  - Delay setting DECIDED field in locale file structure until
+    we have read the file's data (#827510).
+
 * Mon Jun 11 2012 Dennis Gilmore <dennis at ausil.us> - 2.15-46
 - only deal with the arm linker compat hack on armhfp arches 
 - armsfp arches do not have a linker change