diff options
| author |   eric <eric@openbsd.org> | 2014-11-02 13:59:16 +0000 |
|---|---|---|
| committer | eric <eric@openbsd.org> | 2014-11-02 13:59:16 +0000 |
| commit | 0d7b84a898f082aed9d1f2ec3ae7c476483a8f40 (patch) | |
| tree | 10566e59b2ec8d795587185aa26d7c4c6c50670f /lib/libc/asr/getnetnamadr_async.c | |
| parent | use nanosleep() instead of select(); ok jsing (diff) | |
| download | wireguard-openbsd-0d7b84a898f082aed9d1f2ec3ae7c476483a8f40.tar.xz wireguard-openbsd-0d7b84a898f082aed9d1f2ec3ae7c476483a8f40.zip | |
Fix a NULL deref when getting an actual result for an invalid hostname
in gethostbyname(). Similar fix for getnetbyname().
ok deraadt@ daniel@ jca@
Diffstat (limited to 'lib/libc/asr/getnetnamadr_async.c')
| -rw-r--r-- | lib/libc/asr/getnetnamadr_async.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/libc/asr/getnetnamadr_async.c b/lib/libc/asr/getnetnamadr_async.c index f31168ef005..42c371c37e0 100644 --- a/lib/libc/asr/getnetnamadr_async.c +++ b/lib/libc/asr/getnetnamadr_async.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getnetnamadr_async.c,v 1.18 2014/09/15 06:15:48 guenther Exp $ */ +/* $OpenBSD: getnetnamadr_async.c,v 1.19 2014/11/02 13:59:16 eric Exp $ */ /* * Copyright (c) 2012 Eric Faurot <eric@openbsd.org> * @@ -239,11 +239,11 @@ getnetnamadr_async_run(struct asr_query *as, struct asr_result *ar) n->n.n_net = as->as.netnamadr.addr; /* - * No address found in the dns packet. The blocking version - * reports this as an error. + * No valid hostname or address found in the dns packet. + * Ignore it. */ - if (as->as_type == ASR_GETNETBYNAME && n->n.n_net == 0) { - /* XXX wrong */ + if ((as->as_type == ASR_GETNETBYNAME && n->n.n_net == 0) || + n->n.n_name == NULL) { free(n); async_set_state(as, ASR_STATE_NEXT_DB); break; |