ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

crypt32: Don't check decoded length against encoded length for indefinite-form sequences.

This commit is contained in:
Juan Lang 2007-10-01 16:04:34 -07:00 committed by Alexandre Julliard
parent 127fd82a9b
commit 5b09287713
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/crypt32/decode.c
View File

@ -467,10 +467,14 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[],
{ {
DWORD lenBytes = GET_LEN_BYTES(pbEncoded[1]), cbDecoded; DWORD lenBytes = GET_LEN_BYTES(pbEncoded[1]), cbDecoded;
const BYTE *ptr = pbEncoded + 1 + lenBytes; const BYTE *ptr = pbEncoded + 1 + lenBytes;
BOOL indefinite = FALSE;
cbEncoded -= 1 + lenBytes; cbEncoded -= 1 + lenBytes;
if (dataLen == CMSG_INDEFINITE_LENGTH) if (dataLen == CMSG_INDEFINITE_LENGTH)
{
dataLen = cbEncoded; dataLen = cbEncoded;
indefinite = TRUE;
}
else if (cbEncoded < dataLen) else if (cbEncoded < dataLen)
{ {
TRACE("dataLen %d exceeds cbEncoded %d, failing\n", dataLen, TRACE("dataLen %d exceeds cbEncoded %d, failing\n", dataLen,
@ -501,7 +505,7 @@ static BOOL CRYPT_AsnDecodeSequence(struct AsnDecodeSequenceItem items[],
cbDecoded += 2; cbDecoded += 2;
} }
} }
if (ret && cbDecoded != dataLen) if (ret && !indefinite && cbDecoded != dataLen)
{ {
TRACE("expected %d decoded, got %d, failing\n", dataLen, TRACE("expected %d decoded, got %d, failing\n", dataLen,
cbDecoded); cbDecoded);