diff options
author | Werner Koch <[email protected]> | 2015-10-22 07:52:51 +0000 |
---|---|---|
committer | Werner Koch <[email protected]> | 2015-10-22 07:52:51 +0000 |
commit | e03a4a94bb67d4a6c958b37671f83456e203f325 (patch) | |
tree | 2f51a601a5e487a7cbf7863c84be1b63c4cf4669 /dirmngr/dns-stuff.c | |
parent | Move SRV RR code from common/ to dirmngr/. (diff) | |
download | gnupg-e03a4a94bb67d4a6c958b37671f83456e203f325.tar.gz gnupg-e03a4a94bb67d4a6c958b37671f83456e203f325.zip |
dirmngr: Do not use MAXDNAME.
* dirmngr/dns-stuff.c (getsrv): Replace MAXDNAME.
* dirmngr/dns-stuff.h (MAXDNAME): Remove.
(struct srventry): Use a fixed value instead of MAXDNAME.
* dirmngr/http.c (connect_server): Use DIMof instead of MAXDNAME.
Malloc a helper array.
--
Depending on the order of included headers it might be that we allocate
the array with a different size than what we test against in another
module. To make it more robust we use the actual known size of
checking.
A better would be to use a linked list and avoid these large arrays.
Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to '')
-rw-r--r-- | dirmngr/dns-stuff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dirmngr/dns-stuff.c b/dirmngr/dns-stuff.c index c500c34e7..639388f55 100644 --- a/dirmngr/dns-stuff.c +++ b/dirmngr/dns-stuff.c @@ -651,7 +651,7 @@ getsrv (const char *name,struct srventry **list) struct srventry *srv = NULL; struct srventry *newlist; - if (strlen (answer->rrs.srvha[count].ha.host) >= MAXDNAME) + if (strlen (answer->rrs.srvha[count].ha.host) >= sizeof srv->target) { log_info ("hostname in SRV record too long - skipped\n"); continue; @@ -747,7 +747,7 @@ getsrv (const char *name,struct srventry **list) /* Get the name. 2782 doesn't allow name compression, but dn_expand still works to pull the name out of the packet. */ - rc = dn_expand(answer,emsg,pt,srv->target,MAXDNAME); + rc = dn_expand(answer,emsg,pt,srv->target, sizeof srv->target); if (rc == 1 && srv->target[0] == 0) /* "." */ { xfree(*list); |