1 files changed, 11 insertions, 1 deletions
diff --git a/src/lib/krb5/asn.1/kaddr2addr.c b/src/lib/krb5/asn.1/kaddr2addr.c
index a9c67b52a..da565977c 100644
--- a/src/lib/krb5/asn.1/kaddr2addr.c
+++ b/src/lib/krb5/asn.1/kaddr2addr.c
@@ -54,6 +54,11 @@ register int *error;
     register krb5_address * const *temp;
     register int i;
 
+    if (!val) {
+	    *error = EINVAL;
+	    return 0;
+    }
+
     /* count elements */
     for (i = 0, temp = val; *temp; temp++,i++);
 
@@ -89,7 +94,12 @@ register int *error;
     register struct type_KRB5_HostAddresses *retval = 0, *rv1 = 0, *rv2;
     register krb5_address * const *temp;
     register int i;
-
+ 
+    if (!val) {
+	    *error = EINVAL;
+	    return 0;
+    }
+   
     for (i = 0, temp = val; *temp; temp++,i++, rv1 = rv2) {
 
 	rv2 = (struct type_KRB5_HostAddresses *) xmalloc(sizeof(*rv2));