From b68364367b89e3348c09a48eb7f222b4b70d269c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Tue, 20 Aug 2002 00:23:31 +0000 Subject: Update. 2002-08-19 Ulrich Drepper * sysdeps/generic/dl-tls.c (_dl_allocate_tls_init): Return immediately if result == NULL. * locale/loadarchive.c (_nl_load_locale_from_archive): Braino fix --- sysdeps/generic/dl-tls.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'sysdeps/generic/dl-tls.c') diff --git a/sysdeps/generic/dl-tls.c b/sysdeps/generic/dl-tls.c index cb46460d25..2b47195c96 100644 --- a/sysdeps/generic/dl-tls.c +++ b/sysdeps/generic/dl-tls.c @@ -240,7 +240,7 @@ _dl_allocate_tls_storage (void) return result; } -INTDEF(_dl_allocate_tls) + void * internal_function @@ -250,6 +250,10 @@ _dl_allocate_tls_init (void *result) struct dtv_slotinfo_list *listp; size_t total = 0; + if (result == NULL) + /* The memory allocation failed. */ + return NULL; + /* We have to look prepare the dtv for all currently loaded modules using TLS. For those which are dynamically loaded we add the values indicating deferred allocation. */ @@ -315,6 +319,8 @@ _dl_allocate_tls (void) { return _dl_allocate_tls_init (_dl_allocate_tls_storage ()); } +INTDEF(_dl_allocate_tls) + void internal_function -- cgit v1.2.3