* resolv/res_init.c (__res_vinit): Always assign to statp->nscount
after reading name server list.
This commit is contained in:
parent
e87946cce5
commit
905ef0daeb
@ -1,5 +1,8 @@
|
||||
2008-12-07 Ulrich Drepper <drepper@redhat.com>
|
||||
|
||||
* resolv/res_init.c (__res_vinit): Always assign to statp->nscount
|
||||
after reading name server list.
|
||||
|
||||
* nis/nss_nis/nis-hosts.c (_nss_nis_gethostbyname4_r): Fix memory
|
||||
handling for host name aliases.
|
||||
|
||||
|
@ -545,8 +545,7 @@ _nss_nis_gethostbyname4_r (const char *name, struct gaih_addrtuple **pat,
|
||||
size_t h_name_len = strlen (host.h_name) + 1;
|
||||
if (h_name_len >= buflen)
|
||||
goto erange;
|
||||
/* Potentially the string and the destination buffer overlap. */
|
||||
(*pat)->name = memmove (buffer, host.h_name, h_name_len);
|
||||
(*pat)->name = memcpy (buffer, host.h_name, h_name_len);
|
||||
|
||||
free (result);
|
||||
|
||||
|
@ -420,7 +420,6 @@ __res_vinit(res_state statp, int preinit) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
if (nserv > 1)
|
||||
statp->nscount = nserv;
|
||||
#ifdef _LIBC
|
||||
if (nservall - nserv > 0) {
|
||||
|
Loading…
Reference in New Issue
Block a user