29e444
2012-06-14  Jeff Law  <law@redhat.com>
29e444
29e444
29e444
	* locale/loadlocale.c (_nl_load_locale): Delay setting
29e444
	file->decided until we have successfully loaded the file's
29e444
	data.
29e444
29e444
diff --git a/locale/loadlocale.c b/locale/loadlocale.c
29e444
index e3fa187..9fd9216 100644
29e444
--- a/locale/loadlocale.c
29e444
+++ b/locale/loadlocale.c
29e444
@@ -169,7 +169,6 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
29e444
   int save_err;
29e444
   int alloc = ld_mapped;
29e444
 
29e444
-  file->decided = 1;
29e444
   file->data = NULL;
29e444
 
29e444
   fd = open_not_cancel_2 (file->filename, O_RDONLY | O_CLOEXEC);
29e444
@@ -278,6 +277,7 @@ _nl_load_locale (struct loaded_l10nfile *file, int category)
29e444
   newdata->alloc = alloc;
29e444
 
29e444
   file->data = newdata;
29e444
+  file->decided = 1;
29e444
 }
29e444
 
29e444
 void