summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWill Fiveash <will.fiveash@oracle.com>2014-03-21 12:46:08 -0400
committerGreg Hudson <ghudson@mit.edu>2014-03-21 15:58:17 -0400
commit26ac013fbc3eb1abc4e7b692854f8d09baec5780 (patch)
treebaf78ae1bf68ee5a5c94b38d5f9f1571749a32cf
parentd03aff9fa23a5ad223bb7e7a8c48c070d64e1aa3 (diff)
downloadkrb5-26ac013fbc3eb1abc4e7b692854f8d09baec5780.tar.gz
krb5-26ac013fbc3eb1abc4e7b692854f8d09baec5780.tar.xz
krb5-26ac013fbc3eb1abc4e7b692854f8d09baec5780.zip
Fix a harmless DNS glue macro bug
The definition of SAFE_GETUINT16 mistakenly uses "p" instead its ptr parameter in three places, which happens to work because all current invocations of the macro use "p" as the ptr argument. Fix it to correctly use the ptr parameter. [ghudson@mit.edu: commit message] ticket: 6845
-rw-r--r--src/lib/krb5/os/dnsglue.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/krb5/os/dnsglue.h b/src/lib/krb5/os/dnsglue.h
index 2f9192faf..5ab0ad815 100644
--- a/src/lib/krb5/os/dnsglue.h
+++ b/src/lib/krb5/os/dnsglue.h
@@ -141,9 +141,9 @@
#define SAFE_GETUINT16(base, max, ptr, incr, s, label) \
do { \
if (!INCR_OK(base, max, ptr, incr)) goto label; \
- (s) = (unsigned short)(p)[0] << 8 \
- | (unsigned short)(p)[1]; \
- (p) += (incr); \
+ (s) = (unsigned short)(ptr)[0] << 8 \
+ | (unsigned short)(ptr)[1]; \
+ (ptr) += (incr); \
} while (0)
struct krb5int_dns_state;