From ce7265c7438e18f2e4ea81582131a783a1cdd601 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Sun, 26 Sep 2004 04:45:24 +0000 Subject: [BZ #322] Update. * intl/dcigettext.c (DCIGETTEXT): Protect tfind/tsearch calls. * intl/dcigettext.c (_nl_find_msg): Call _nl_load_domain also if decided < 0. * intl/finddomain.c (_nl_find_domain): Likewise. * intl/l10nflist.c (_nl_make_l10nflist): Initialize lock. * intl/loadinfo.h (struct loaded_l10nfile): Add lock element. * intl/loadmsgcat.c (_nl_load_domain): Set decided to 1 only once we are done. First set to -1 to signal initialization is ongoing. Protect against concurrent callers with recursive lock. duplicate address recognition does not copy junk. [BZ #322] --- intl/loadinfo.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'intl/loadinfo.h') diff --git a/intl/loadinfo.h b/intl/loadinfo.h index c2b6971b36..913022eb7b 100644 --- a/intl/loadinfo.h +++ b/intl/loadinfo.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1996-2000, 2002, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1996-2000, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper , 1996. @@ -20,6 +20,8 @@ #ifndef _LOADINFO_H #define _LOADINFO_H 1 +#include + /* Declarations of locale dependent catalog lookup functions. Implemented in @@ -61,6 +63,7 @@ struct loaded_l10nfile { const char *filename; int decided; + __libc_lock_define_recursive (, lock); const void *data; -- cgit v1.2.3