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

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

Showing with 7 additions and 2 deletions

decode.c dlls/crypt32/decode.c +7 -2

No files found.
--- a/dlls/crypt32/decode.c
+++ b/dlls/crypt32/decode.c
@@ -357,8 +357,13 @@ static BOOL CRYPT_AsnDecodeSequenceItems(struct AsnDecodeSequenceItem items[],
                         : NULL, &items[i].size, &itemDecoded);
                        if (ret)
                        {
-                            /* Account for alignment padding */
-                            items[i].size = ALIGN_DWORD_PTR(items[i].size);
+                            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)