1900-Handle-errors-in-PDB-parsing.patch

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Ko=C5=88a=C5=99=C3=ADk?= <dvd.kon@gmail.com>
Date: Tue, 26 May 2020 19:14:06 +0200
Subject: [PATCH] 1900: Handle errors in PDB parsing

---
 Ghidra/Features/PDB/src/pdb/cpp/iterate.cpp | 21 ++++++++++++++-------
 Ghidra/Features/PDB/src/pdb/cpp/pdb.cpp     |  9 +++++++++
 Ghidra/Features/PDB/src/pdb/headers/pdb.h   |  2 ++
 3 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/Ghidra/Features/PDB/src/pdb/cpp/iterate.cpp b/Ghidra/Features/PDB/src/pdb/cpp/iterate.cpp
index e2991297a2..718efd8b1e 100644
--- a/Ghidra/Features/PDB/src/pdb/cpp/iterate.cpp
+++ b/Ghidra/Features/PDB/src/pdb/cpp/iterate.cpp
@@ -19,7 +19,8 @@ static void iterateEnumMembers(IDiaSymbol& symbol) {
 	DWORD celt = 0;
 	CComPtr<IDiaEnumSymbols> pEnum;
 	CComPtr<IDiaSymbol> pMember;
-	symbol.findChildren(SymTagNull, NULL, nsNone, &pEnum);
+	HRESULT res = symbol.findChildren(SymTagNull, NULL, nsNone, &pEnum);
+	handleFindChildrenError(res);
 	if (pEnum == NULL) {
 		return;
 	}
@@ -41,7 +42,8 @@ void iterateEnums(PDBApiContext& ctx) {
 	DWORD celt = 0;
 	CComPtr<IDiaEnumSymbols> pEnum;
 	CComPtr<IDiaSymbol> pSymbol;
-	ctx.Global().findChildren(SymTagEnum, NULL, nsNone, &pEnum);
+	HRESULT res = ctx.Global().findChildren(SymTagEnum, NULL, nsNone, &pEnum);
+	handleFindChildrenError(res);
 	if (pEnum == NULL) {
 		return;
 	}
@@ -72,7 +74,8 @@ void iterateEnums(PDBApiContext& ctx) {
 static void iterateMembers(IDiaSymbol& symbol) {
 	DWORD celt = 0;
 	CComPtr<IDiaEnumSymbols> pEnum;
-	symbol.findChildren(SymTagNull, NULL, nsNone, &pEnum);
+	HRESULT res = symbol.findChildren(SymTagNull, NULL, nsNone, &pEnum);
+	handleFindChildrenError(res);
 	if (pEnum == NULL) {
 		return;
 	}
@@ -98,7 +101,8 @@ static void iterateMembers(IDiaSymbol& symbol) {
 void iterateDataTypes(PDBApiContext& ctx) {
 	DWORD celt = 0;
 	CComPtr<IDiaEnumSymbols> pEnum;
-	ctx.Global().findChildren(SymTagUDT, NULL, nsNone/*nsfCaseInsensitive|nsfUndecoratedName*/, &pEnum);
+	HRESULT res = ctx.Global().findChildren(SymTagUDT, NULL, nsNone/*nsfCaseInsensitive|nsfUndecoratedName*/, &pEnum);
+	handleFindChildrenError(res);
 	if (pEnum == NULL) {
 		return;
 	}
@@ -140,7 +144,8 @@ void iterateDataTypes(PDBApiContext& ctx) {
 void iterateTypedefs(PDBApiContext& ctx) {
 	DWORD celt = 0;
 	CComPtr<IDiaEnumSymbols> pEnum;
-	ctx.Global().findChildren(SymTagTypedef, NULL, nsNone/*nsfCaseInsensitive|nsfUndecoratedName*/, &pEnum);
+	HRESULT res = ctx.Global().findChildren(SymTagTypedef, NULL, nsNone/*nsfCaseInsensitive|nsfUndecoratedName*/, &pEnum);
+	handleFindChildrenError(res);
 	if (pEnum == NULL) {
 		return;
 	}
@@ -167,7 +172,8 @@ void iterateTypedefs(PDBApiContext& ctx) {
 void iterateClasses(PDBApiContext& ctx) {
 	DWORD celt = 0;
 	CComPtr<IDiaEnumSymbols> pEnum;
-	ctx.Global().findChildren(SymTagUDT, NULL, nsNone/*nsfCaseInsensitive|nsfUndecoratedName*/, &pEnum);
+	HRESULT res = ctx.Global().findChildren(SymTagUDT, NULL, nsNone/*nsfCaseInsensitive|nsfUndecoratedName*/, &pEnum);
+	handleFindChildrenError(res);
 	if (pEnum == NULL) {
 		return;
 	}
@@ -334,7 +340,8 @@ void iterateFunctions(PDBApiContext& ctx) {
 	DWORD celt = 0;
 	CComPtr<IDiaEnumSymbols> pEnum;
 	CComPtr<IDiaSymbol> pSymbol;
-	ctx.Global().findChildren(SymTagFunction, NULL, nsNone, &pEnum);
+	HRESULT res = ctx.Global().findChildren(SymTagNull, NULL, nsNone, &pEnum);
+	handleFindChildrenError(res);
 	if (pEnum == NULL) {
 		return;
 	}
diff --git a/Ghidra/Features/PDB/src/pdb/cpp/pdb.cpp b/Ghidra/Features/PDB/src/pdb/cpp/pdb.cpp
index ec147b7867..9fd0489292 100644
--- a/Ghidra/Features/PDB/src/pdb/cpp/pdb.cpp
+++ b/Ghidra/Features/PDB/src/pdb/cpp/pdb.cpp
@@ -118,4 +118,13 @@ int PDBApiContext::init(const std::wstring& szFilename, const std::wstring& szSi
 	return hr;
 }
 
+void handleFindChildrenError(HRESULT res) {
+	if (!FAILED(res)) {
+		return;
+	}
 
+	if (res == E_NOTIMPL) {
+		fatal("findChilren() returned E_NOTIMPL. Maybe the input file is an unsupported partial PDB\n");
+	}
+	fatal("findChildren() failed\n");
+}
diff --git a/Ghidra/Features/PDB/src/pdb/headers/pdb.h b/Ghidra/Features/PDB/src/pdb/headers/pdb.h
index 194f700fc2..058f5de54e 100644
--- a/Ghidra/Features/PDB/src/pdb/headers/pdb.h
+++ b/Ghidra/Features/PDB/src/pdb/headers/pdb.h
@@ -66,4 +66,6 @@ private:
 	CComPtr<IDiaDataSource>   pSource;
 };
 
+void handleFindChildrenError(HRESULT res);
+
 #endif
-- 
2.45.1