2012-06-14  Jeff Law  <law@redhat.com>


	* locale/loadlocale.c (_nl_load_locale): Delay setting
	file->decided until we have successfully loaded the file's
	data.

diff --git glibc-2.17-c758a686/locale/loadlocale.c glibc-2.17-c758a686/locale/loadlocale.c
index e3fa187..9fd9216 100644
--- glibc-2.17-c758a686/locale/loadlocale.c
+++ glibc-2.17-c758a686/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