From 6af8029154cd76b998d3be2fe59c461295eef0e9 Mon Sep 17 00:00:00 2001 From: Rainer Schuetze Date: Wed, 12 Dec 2018 08:16:08 +0100 Subject: fix #41: cv2pdb crashes if mspdb*.dll cannot be loaded from path --- src/mspdb.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/mspdb.cpp b/src/mspdb.cpp index 2e968f8..00684ed 100644 --- a/src/mspdb.cpp +++ b/src/mspdb.cpp @@ -96,7 +96,9 @@ bool tryLoadMsPdbCom(const char* mspdb, const char* path = 0) unsigned long fetched; auto result = query.CreateInstance(__uuidof(SetupConfiguration)); - if ((FAILED(result) && result != REGDB_E_CLASSNOTREG) || FAILED(query->EnumInstances(&instances))) + if (FAILED(result) || !query) + return false; + if (FAILED(query->EnumInstances(&instances))) return false; while (!modMsPdb) -- cgit v0.12