aboutsummaryrefslogtreecommitdiff
path: root/sysdeps
diff options
context:
space:
mode:
authorMingli Yu <Mingli.Yu@windriver.com>2018-09-20 12:02:48 +0200
committerFlorian Weimer <fweimer@redhat.com>2018-09-20 12:02:48 +0200
commit1214ba06e6771acb953a190091b0f6055c64fd25 (patch)
tree2d153421a34ad65f7729db9042595e877d18df94 /sysdeps
parent791b350dc725545e3f9b5db0f97ebdbc60c9735f (diff)
downloadglibc-1214ba06e6771acb953a190091b0f6055c64fd25.zip
glibc-1214ba06e6771acb953a190091b0f6055c64fd25.tar.gz
glibc-1214ba06e6771acb953a190091b0f6055c64fd25.tar.bz2
Linux gethostid: Check for NULL value from gethostbyname_r [BZ #23679]
A NULL value can happen with certain gethostbyname_r failures.
Diffstat (limited to 'sysdeps')
-rw-r--r--sysdeps/unix/sysv/linux/gethostid.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/gethostid.c b/sysdeps/unix/sysv/linux/gethostid.c
index 2e20f03..ee0190e 100644
--- a/sysdeps/unix/sysv/linux/gethostid.c
+++ b/sysdeps/unix/sysv/linux/gethostid.c
@@ -102,12 +102,12 @@ gethostid (void)
{
int ret = __gethostbyname_r (hostname, &hostbuf,
tmpbuf.data, tmpbuf.length, &hp, &herr);
- if (ret == 0)
+ if (ret == 0 && hp != NULL)
break;
else
{
/* Enlarge the buffer on ERANGE. */
- if (herr == NETDB_INTERNAL && errno == ERANGE)
+ if (ret != 0 && herr == NETDB_INTERNAL && errno == ERANGE)
{
if (!scratch_buffer_grow (&tmpbuf))
return 0;