[28296] in CVS-changelog-for-Kerberos-V5
krb5 commit: Fix a harmless DNS glue macro bug
daemon@ATHENA.MIT.EDU (Greg Hudson)
Fri Mar 21 16:09:28 2014
Date: Fri, 21 Mar 2014 16:09:19 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201403212009.s2LK9Jlo009104@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/26ac013fbc3eb1abc4e7b692854f8d09baec5780
commit 26ac013fbc3eb1abc4e7b692854f8d09baec5780
Author: Will Fiveash <will.fiveash@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@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;
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
