oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Various bug fixes in hdb-mitdb.c.

Browse Source 
Signed-off-by: Love Hornquist Astrand <lha@h5l.org>
This commit is contained in:
Nicolas Williams
2011-03-31 21:57:35 -05:00
committed by Love Hornquist Astrand
parent 941eba430b
commit b5137810fb
1 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
lib/hdb/hdb-mitdb.c
View File

@@ -205,7 +205,7 @@ mdb_value2entry(krb5_context context, krb5_data *data, krb5_kvno kvno, hdb_entry
uint32_t u32; uint32_t u32;
uint16_t u16, num_keys, num_tl; uint16_t u16, num_keys, num_tl;
size_t i, j; size_t i, j;
char *p = NULL; char *p;
sp = krb5_storage_from_data(data); sp = krb5_storage_from_data(data);
if (sp == NULL) { if (sp == NULL) {
@@ -292,10 +292,14 @@ mdb_value2entry(krb5_context context, krb5_data *data, krb5_kvno kvno, hdb_entry
* but we don't want to take chances, so we add an extra NUL. * but we don't want to take chances, so we add an extra NUL.
*/ */
p = malloc(u16 + 1); p = malloc(u16 + 1);
if (p == NULL) {
ret = ENOMEM;
goto out;
}
krb5_storage_read(sp, p, u16); krb5_storage_read(sp, p, u16);
p[u16] = '\0'; p[u16] = '\0';
CHECK(ret = krb5_parse_name(context, p, &entry->principal)); CHECK(ret = krb5_parse_name(context, p, &entry->principal));
free(p); p = NULL; free(p);
} }
/* for num tl data times /* for num tl data times
16: tl data type 16: tl data type
@@ -330,7 +334,11 @@ mdb_value2entry(krb5_context context, krb5_data *data, krb5_kvno kvno, hdb_entry
version = u16; version = u16;
CHECK(ret = krb5_ret_uint16(sp, &u16)); CHECK(ret = krb5_ret_uint16(sp, &u16));
if (((entry->kvno < u16) && kvno == 0) || kvno == u16) { /*
* First time through, and until we find one matching key,
* entry->kvno == 0.
*/
if ((entry->kvno < u16) && (kvno == 0 || kvno == u16)) {
keep = 1; keep = 1;
entry->kvno = u16; entry->kvno = u16;
/* /*
@@ -347,6 +355,7 @@ mdb_value2entry(krb5_context context, krb5_data *data, krb5_kvno kvno, hdb_entry
entry->keys.len = 0; entry->keys.len = 0;
entry->keys.val = NULL; entry->keys.val = NULL;
} else if (entry->kvno == u16) } else if (entry->kvno == u16)
/* Accumulate keys */
keep = 1; keep = 1;
if (keep) { if (keep) {
@@ -365,12 +374,12 @@ mdb_value2entry(krb5_context context, krb5_data *data, krb5_kvno kvno, hdb_entry
memset(k, 0, sizeof(*k)); memset(k, 0, sizeof(*k));
entry->keys.len += 1; entry->keys.len += 1;
entry->keys.val[i].mkvno = malloc(sizeof(*entry->keys.val[i].mkvno)); k->mkvno = malloc(sizeof(*k->mkvno));
if (entry->keys.val[i].mkvno == NULL) { if (k->mkvno == NULL) {
ret = ENOMEM; ret = ENOMEM;
goto out; goto out;
} }
*entry->keys.val[i].mkvno = 1; *k->mkvno = 1;
for (j = 0; j < version; j++) { for (j = 0; j < version; j++) {
uint16_t type; uint16_t type;
@@ -451,9 +460,6 @@ mdb_value2entry(krb5_context context, krb5_data *data, krb5_kvno kvno, hdb_entry
if (ret == HEIM_ERR_EOF) if (ret == HEIM_ERR_EOF)
/* Better error code than "end of file" */ /* Better error code than "end of file" */
ret = HEIM_ERR_BAD_HDBENT_ENCODING; ret = HEIM_ERR_BAD_HDBENT_ENCODING;
if (p)
free(p);
free_hdb_entry(entry);
return ret; return ret;
} }