Skip to content

W
wine-cw
Commit f0509c49 authored by Juan Lang's avatar Juan Lang Committed by Alexandre Julliard
Browse files
Options

crypt32: Simplify alignment calculation.

parent 5270b323
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 9 deletions
dlls/crypt32/decode.c
View file @ f0509c49
...@@ -351,19 +351,13 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType, ...@@ -351,19 +351,13 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType,
: NULL, &items[i].size); : NULL, &items[i].size);
if (ret) if (ret)
{ {
if (nextData && items[i].hasPointer &&
items[i].size > items[i].minSize)
{
nextData += items[i].size - items[i].minSize;
/* align nextData to DWORD boundaries */
if (items[i].size % sizeof(DWORD))
nextData += sizeof(DWORD) - items[i].size %
sizeof(DWORD);
}
/* Account for alignment padding */ /* Account for alignment padding */
if (items[i].size % sizeof(DWORD)) if (items[i].size % sizeof(DWORD))
items[i].size += sizeof(DWORD) - items[i].size += sizeof(DWORD) -
items[i].size % sizeof(DWORD); items[i].size % sizeof(DWORD);
if (nextData && items[i].hasPointer &&
items[i].size > items[i].minSize)
nextData += items[i].size - items[i].minSize;
ptr += 1 + nextItemLenBytes + nextItemLen; ptr += 1 + nextItemLenBytes + nextItemLen;
decoded += 1 + nextItemLenBytes + nextItemLen; decoded += 1 + nextItemLenBytes + nextItemLen;
TRACE("item %d: decoded %d bytes\n", i, TRACE("item %d: decoded %d bytes\n", i,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment