diff --git a/lib/krb5/store.c b/lib/krb5/store.c
index 192490126..f7f819cba 100644
--- a/lib/krb5/store.c
+++ b/lib/krb5/store.c
@@ -396,8 +396,11 @@ krb5_ret_addrs(krb5_storage *sp, krb5_addresses *adr)
 {
     int i;
     int ret;
-    ret = krb5_ret_int32(sp, &adr->len);
+    int32_t tmp;
+
+    ret = krb5_ret_int32(sp, &tmp);
     if(ret) return ret;
+    adr->len = tmp;
     adr->val = ALLOC(adr->len, krb5_address);
     for(i = 0; i < adr->len; i++){
 	ret = krb5_ret_address(sp, &adr->val[i]);