crypt32: Stop reading a serialized store if a non-context prop ID appears before a context prop ID.

0cf2e6fa · Juan Lang · Alexandre Julliard · bc3fa107 · 0cf2e6fa
Commit 0cf2e6fa authored Nov 10, 2009 by Juan Lang Committed by Alexandre Julliard Nov 11, 2009
Show whitespace changes
Inline Side-by-side

Showing with 12 additions and 2 deletions

serialize.c dlls/crypt32/serialize.c +12 -2

No files found.
--- a/dlls/crypt32/serialize.c
+++ b/dlls/crypt32/serialize.c
@@ -499,8 +499,18 @@ static BOOL CRYPT_ReadSerializedStore(void *handle,
                                 CERT_STORE_ADD_NEW, &context);
                            }
                            else
-                                ret = CRYPT_ReadContextProp(contextInterface,
-                                 context, &propHdr, buf, read);
+                            {
+                                if (!contextInterface)
+                                {
+                                    WARN("prop id %d before a context id\n",
+                                     propHdr.propID);
+                                    ret = FALSE;
+                                }
+                                else
+                                    ret = CRYPT_ReadContextProp(
+                                     contextInterface, context, &propHdr, buf,
+                                     read);
+                            }
                        }
                    }
                    else