diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-08-20 00:23:31 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-08-20 00:23:31 +0000 |
| commit | b68364367b89e3348c09a48eb7f222b4b70d269c (patch) | |
| tree | 5e322b87678aaa21b5903040e6256df161e0f66e /sysdeps/generic/dl-tls.c | |
| parent | 46615777f5cef0d0ade26ac3978b7f2ed5a1cea2 (diff) | |
| download | glibc-b68364367b89e3348c09a48eb7f222b4b70d269c.tar glibc-b68364367b89e3348c09a48eb7f222b4b70d269c.tar.gz glibc-b68364367b89e3348c09a48eb7f222b4b70d269c.tar.bz2 glibc-b68364367b89e3348c09a48eb7f222b4b70d269c.zip | |
Update.
2002-08-19 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/dl-tls.c (_dl_allocate_tls_init): Return
immediately if result == NULL.
* locale/loadarchive.c (_nl_load_locale_from_archive): Braino fix
Diffstat (limited to 'sysdeps/generic/dl-tls.c')
| -rw-r--r-- | sysdeps/generic/dl-tls.c | 8 |
1 files changed, 7 insertions, 1 deletions
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 |