From 9cd7fe75cce996992e7c220130ed5ef5d7758ff6 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Tue, 20 Jul 2010 17:35:13 +0200
Subject: [PATCH] fix assertion in CdbDebugEventCallback::UnloadModule
Parameter ImageBaseName can be NULL.
This seems to happen for modules like kernel32.dll and other
modules in the guts of the OS.
---
src/plugins/debugger/cdb/cdbdebugeventcallback.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
index 4322ac74c7f..ac2e3ddb538 100644
--- a/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
+++ b/src/plugins/debugger/cdb/cdbdebugeventcallback.cpp
@@ -183,10 +183,11 @@ STDMETHODIMP CdbDebugEventCallback::UnloadModule(
__in ULONG64 BaseOffset
)
{
- Q_UNUSED(ImageBaseName)
Q_UNUSED(BaseOffset)
if (debugCDB > 1)
qDebug() << Q_FUNC_INFO << ImageBaseName;
+ if (!ImageBaseName)
+ return S_OK;
m_pEngine->m_d->handleModuleUnload(QString::fromUtf16(reinterpret_cast<const ushort *>(ImageBaseName)));
handleModuleUnload();
m_pEngine->m_d->updateModules();
--
GitLab