Make CLSIDFromString return a CLSID of zeros instead of crashing when passed a null pointer.
diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index d0d352c..8ec347e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c
@@ -452,7 +452,10 @@ int i; BYTE table[256]; - TRACE("%s -> %p\n", idstr, id); + if (!s) + s = "{00000000-0000-0000-0000-000000000000}"; + + TRACE("%s -> %p\n", s, id); /* quick lookup table */ memset(table, 0, 256); @@ -467,7 +470,7 @@ /* in form {XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX} */ - if (strlen(idstr) != 38) + if (strlen(s) != 38) return OLE_ERROR_OBJECT; p = (BYTE *) id;