OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Stop crash in OOM handling in NSS

This commit is contained in:
Ulrich Drepper 2011-10-06 03:18:20 -04:00
parent 64031225b2
commit 054c0457fd
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2011-10-06 Ulrich Drepper <drepper@gmail.com>
* nss/nsswitch.c (__nss_lookup_function): Fix order of deleting
from tree and freeing node.
2011-09-25 Jiri Olsa <jolsa@redhat.com>
* nss/nsswitch.c (__nss_database_lookup): Handle

8
nss/nsswitch.c
View File

@ -407,6 +407,7 @@ __nss_lookup_function (service_user *ni, const char *fct_name)
/* Oops. We can't instantiate this node properly.
Remove it from the tree. */
__tdelete (&fct_name, &ni->known, &known_compare);
free (known);
result = NULL;
}
else
@ -418,11 +419,8 @@ __nss_lookup_function (service_user *ni, const char *fct_name)
#if !defined DO_STATIC_NSS || defined SHARED
/* Load the appropriate library. */
if (nss_load_library (ni) != 0)
{
/* This only happens when out of memory. */
free (known);
goto remove_from_tree;
}
/* This only happens when out of memory. */
goto remove_from_tree;
if (ni->library->lib_handle == (void *) -1l)
/* Library not found => function not found. */