giomba
/
opensc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix handling for SIMPLE-TLV records with a three-byte length 

git-svn-id: https://www.opensc-project.org/svnp/opensc/trunk@3027 c6295689-39f2-0310-b995-f0e70906c6a9
This commit is contained in:
henryk 2006-09-26 10:43:28 +00:00
parent 325b9480ea
commit 12c6b11bdd
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/libopensc/pkcs15.c
View File

@ -1622,7 +1622,7 @@ int sc_pkcs15_read_file(struct sc_pkcs15_card *p15card,
} else if (file->ef_structure == SC_FILE_EF_LINEAR_VARIABLE_TLV)
{
int i;
size_t l;
size_t l, record_len;
unsigned char *head;
head = data;
@ -1639,10 +1639,19 @@ int sc_pkcs15_read_file(struct sc_pkcs15_card *p15card,
free(data);
goto fail_unlock;
}
if (r <= 2)
if (r < 2)
break;
memmove(head,head+2,r-2);
head += (r-2);
record_len = head[1];
if (record_len != 0xff) {
memmove(head,head+2,r-2);
head += (r-2);
} else {
if (r < 4)
break;
record_len = head[2] * 256 + head[3];
memmove(head,head+4,r-4);
head += (r-4);
}
}
len = head-data;
r = len;