From: Lukas Slebodnik <lslebodn@redhat.com>
Date: Sat, 21 Jun 2014 14:11:31 +0000 (+0200)
Subject: Fix argment validation in krb5_make_fulladdr
X-Git-Tag: krb5-1.13-alpha1~57
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=347e70a0649d976f10236d682ee4999569b964d4;p=thirdparty%2Fkrb5.git

Fix argment validation in krb5_make_fulladdr

Check kaddr and kport, not kport twice.

[ghudson@mit.edu: clarified commit message, minor style change]
---

diff --git a/src/lib/krb5/os/mk_faddr.c b/src/lib/krb5/os/mk_faddr.c
index 7e125cfcf7..2577df3010 100644
--- a/src/lib/krb5/os/mk_faddr.c
+++ b/src/lib/krb5/os/mk_faddr.c
@@ -42,7 +42,7 @@ krb5_make_fulladdr(krb5_context context, krb5_address *kaddr,
     krb5_int32 tmp32;
     krb5_int16 tmp16;
 
-    if ((kport == NULL) || (kport == NULL))
+    if (kaddr == NULL || kport == NULL)
         return EINVAL;
 
     raddr->length = kaddr->length + kport->length + (4 * sizeof(krb5_int32));