krb5 commit: Fix a harmless DNS glue macro bug

Greg Hudson ghudson at MIT.EDU
Fri Mar 21 16:09:19 EDT 2014


https://github.com/krb5/krb5/commit/26ac013fbc3eb1abc4e7b692854f8d09baec5780
commit 26ac013fbc3eb1abc4e7b692854f8d09baec5780
Author: Will Fiveash <will.fiveash at oracle.com>
Date:   Fri Mar 21 12:46:08 2014 -0400

    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 at mit.edu: commit message]
    
    ticket: 6845

 src/lib/krb5/os/dnsglue.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

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


More information about the cvs-krb5 mailing list