* nscd/nscd_helper.c (get_mapping): Handle short replies instead

of crashing.  When this is the case or if the reply is malformed,
	don't try to close the new file descriptor since it does not
	exist.
	Patch in part by Guillaume Chazarain <guichaz@yahoo.fr>.
This commit is contained in:
Ulrich Drepper 2007-05-29 14:45:49 +00:00
parent 40f57573d0
commit 5da4373cfd
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,11 @@
2007-05-29 Ulrich Drepper <drepper@redhat.com>
* nscd/nscd_helper.c (get_mapping): Handle short replies instead
of crashing. When this is the case or if the reply is malformed,
don't try to close the new file descriptor since it does not
exist.
Patch in part by Guillaume Chazarain <guichaz@yahoo.fr>.
2007-05-28 Jakub Jelinek <jakub@redhat.com>
* sysdeps/unix/sysv/linux/futimes.c (miss_utimensat): Don't define

View File

@ -271,9 +271,10 @@ get_mapping (request_type type, const char *key,
mapfd = *(int *) CMSG_DATA (cmsg);
if (__builtin_expect (CMSG_FIRSTHDR (&msg)->cmsg_len
!= CMSG_LEN (sizeof (int)), 0))
goto out_close;
if (__builtin_expect (CMSG_FIRSTHDR (&msg) == NULL
|| (CMSG_FIRSTHDR (&msg)->cmsg_len
!= CMSG_LEN (sizeof (int))), 0))
goto out_close2;
struct stat64 st;
if (__builtin_expect (strcmp (resdata, key) != 0, 0)