From: Will Fiveash <will.fiveash@oracle.com>
Date: Fri, 21 Mar 2014 16:46:08 +0000 (-0400)
Subject: Fix a harmless DNS glue macro bug
X-Git-Tag: krb5-1.13-alpha1~172
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26ac013fbc3eb1abc4e7b692854f8d09baec5780;p=thirdparty%2Fkrb5.git

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
---

diff --git a/src/lib/krb5/os/dnsglue.h b/src/lib/krb5/os/dnsglue.h
index 2f9192faf0..5ab0ad8159 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;