Merge lorikeet-heimdal -r 787 into Samba4 tree.

[jelmer/samba4-debian.git] / source / heimdal / lib / hdb / mkey.c

diff --git a/source/heimdal/lib/hdb/mkey.c b/source/heimdal/lib/hdb/mkey.c
index 02d87b6cf3efbd00560b1bc266e3cf2733504c1a..05cf71c59311c125d7bd09d1ed01f6d3667b69b5 100644 (file)
--- a/source/heimdal/lib/hdb/mkey.c
+++ b/source/heimdal/lib/hdb/mkey.c
@@ -36,7 +36,7 @@
 #define O_BINARY 0
 #endif
 
-RCSID("$Id: mkey.c 17445 2006-05-05 10:37:46Z lha $");
+RCSID("$Id: mkey.c 21745 2007-07-31 16:11:25Z lha $");
 
 struct hdb_master_key_data {
     krb5_keytab_entry keytab;
@@ -129,6 +129,11 @@ read_master_keytab(krb5_context context, const char *filename,
     *mkey = NULL;
     while(krb5_kt_next_entry(context, id, &entry, &cursor) == 0) {
        p = calloc(1, sizeof(*p));
+       if(p == NULL) {
+           krb5_kt_end_seq_get(context, id, &cursor);
+           ret = ENOMEM;
+           goto out;
+       }
        p->keytab = entry;
        ret = krb5_crypto_init(context, &p->keytab.keyblock, 0, &p->crypto);
        p->next = *mkey;