wintrust: Make sure item size is at least the min size, and only align sizes that are greater.

a5087e60 · Juan Lang · Alexandre Julliard · 18ba0ae5 · a5087e60
Commit a5087e60 authored Oct 22, 2009 by Juan Lang Committed by Alexandre Julliard Oct 23, 2009
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 0 deletions

asn.c dlls/wintrust/asn.c +5 -0

No files found.
--- a/dlls/wintrust/asn.c
+++ b/dlls/wintrust/asn.c
@@ -1525,8 +1525,13 @@ static BOOL CRYPT_AsnDecodeSequenceItems(DWORD dwCertEncodingType,
                         : NULL, &items[i].size);
                        if (ret)
                        {
+                            if (items[i].size < items[i].minSize)
+                                items[i].size = items[i].minSize;
+                            else if (items[i].size > items[i].minSize)
+                            {
                                /* Account for alignment padding */
                                items[i].size = ALIGN_DWORD_PTR(items[i].size);
+                            }
                            TRACE("item %d size: %d\n", i, items[i].size);
                            if (nextData && items[i].hasPointer &&
                             items[i].size > items[i].minSize)