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

check size of entry before trying to read 32-bit kvno; also fix typo

Browse Source 
in previous


git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@11025 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Johan Danielsson
2002-05-28 12:57:27 +00:00
parent d092cc3700
commit e76e0dc990
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lib/krb5/keytab_file.c
View File

@@ -352,7 +352,7 @@ fkt_next_entry_int(krb5_context context,
int ret; int ret;
int8_t tmp8; int8_t tmp8;
int32_t tmp32; int32_t tmp32;
off_t pos; off_t pos, curpos;
pos = krb5_storage_seek(cursor->sp, 0, SEEK_CUR); pos = krb5_storage_seek(cursor->sp, 0, SEEK_CUR);
loop: loop:
@@ -380,14 +380,17 @@ loop:
/* there might be a 32 bit kvno here /* there might be a 32 bit kvno here
* if it's zero, assume that the 8bit one was right, * if it's zero, assume that the 8bit one was right,
* otherwise trust the new value */ * otherwise trust the new value */
ret = krb5_ret_int32(cursor->sp, &tmp32); curpos = krb5_storage_seek(cursor->sp, 0, SEEK_CUR);
if (ret == 0 && tmp32 != 0) { if(len + 4 + pos - curpos == 4) {
entry->vno = tmp32; ret = krb5_ret_int32(cursor->sp, &tmp32);
if (ret == 0 && tmp32 != 0) {
entry->vno = tmp32;
}
} }
if(start) *start = pos; if(start) *start = pos;
if(end) *end = *start + 4 + len; if(end) *end = *start + 4 + len;
out: out:
krb5_storage_seek(cursor->sp, pos + 4 + len, SEEK_CUR); krb5_storage_seek(cursor->sp, pos + 4 + len, SEEK_SET);
return ret; return ret;
} }