051a34bb83
Upstream commit: 2585d7b839559e665d5723734862fbe62264b25d - Do not use generic selection in C++ mode - Do not use __builtin_types_compatible_p in C++ mode (#1481205) - x86-64: Check FMA_Usable in ifunc-mathvec-avx2.h (swbz#21966) - Various locale fixes (swbz#21750, swbz#21960, swbz#21959, swbz#19852) - Fix sigval namespace (swbz#21944) - x86-64: Optimize e_expf with FMA (swbz#21912) - Adjust glibc-rh827510.patch.
28 lines
706 B
Diff
28 lines
706 B
Diff
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 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_nocancel (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
|