diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/ChangeLog | 6 | ||||
| -rw-r--r-- | common/pka.c | 22 |
2 files changed, 19 insertions, 9 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index 9c18680ce..84843cd09 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,9 @@ +2011-01-10 Thomas Mraz <[email protected]> (wk) + + * pka.c (get_pka_info) [!USE_ADNS]: Turn ANSWER into a union to + avoid aliasing problems with modern compilers. See bug#1307. + Reported by Steve Grubb. + 2011-01-10 Werner Koch <[email protected]> * session-env.c (update_var): Fix same value test. Fixes diff --git a/common/pka.c b/common/pka.c index 3d68802fe..b1247f602 100644 --- a/common/pka.c +++ b/common/pka.c @@ -173,7 +173,11 @@ get_pka_info (const char *address, unsigned char *fpr) return buffer; #else /*!USE_ADNS*/ - unsigned char answer[PACKETSZ]; + union + { + signed char p[PACKETSZ]; + HEADER h; + } answer; int anslen; int qdcount, ancount, nscount, arcount; int rc; @@ -192,11 +196,11 @@ get_pka_info (const char *address, unsigned char *fpr) memcpy (name, address, domain - address); strcpy (stpcpy (name + (domain-address), "._pka."), domain+1); - anslen = res_query (name, C_IN, T_TXT, answer, PACKETSZ); + anslen = res_query (name, C_IN, T_TXT, answer.p, PACKETSZ); xfree (name); if (anslen < sizeof(HEADER)) return NULL; /* DNS resolver returned a too short answer. */ - if ( (rc=((HEADER*)answer)->rcode) != NOERROR ) + if ( (rc=answer.h.rcode) != NOERROR ) return NULL; /* DNS resolver returned an error. */ /* We assume that PACKETSZ is large enough and don't do dynmically @@ -204,16 +208,16 @@ get_pka_info (const char *address, unsigned char *fpr) if (anslen > PACKETSZ) return NULL; /* DNS resolver returned a too long answer */ - qdcount = ntohs (((HEADER*)answer)->qdcount); - ancount = ntohs (((HEADER*)answer)->ancount); - nscount = ntohs (((HEADER*)answer)->nscount); - arcount = ntohs (((HEADER*)answer)->arcount); + qdcount = ntohs (answer.h.qdcount); + ancount = ntohs (answer.h.ancount); + nscount = ntohs (answer.h.nscount); + arcount = ntohs (answer.h.arcount); if (!ancount) return NULL; /* Got no answer. */ - p = answer + sizeof (HEADER); - pend = answer + anslen; /* Actually points directly behind the buffer. */ + p = answer.p + sizeof (HEADER); + pend = answer.p + anslen; /* Actually points directly behind the buffer. */ while (qdcount-- && p < pend) { |