1 files changed, 12 insertions, 0 deletions
diff --git a/modules.c b/modules.c
index 357a2fe9..70945cae 100644
--- a/modules.c
+++ b/modules.c
@@ -484,7 +484,12 @@ modUnlinkAndDestroy(modInfo_t *pThis)
 	/* finally, we are ready for the module to go away... */
 	dbgprintf("Unloading module %s\n", modGetName(pThis));
 	CHKiRet(modPrepareUnload(pThis));
+modInfo_t *prev, *next;
+char *name = strdup(pThis->pszName);
+prev = pThis->pPrev; next = pThis->pNext;
 	moduleDestruct(pThis);
+dbgprintf("end unload, pThis %p (%s), prev %p, next %p\n", pThis, name, prev, next);
+free(name);
 
 finalize_it:
 	RETiRet;
@@ -512,6 +517,13 @@ modUnloadAndDestructAll(eModLinkType_t modLinkTypesToUnload)
 		}
 	}
 
+#	ifdef DEBUG
+		if(pLoadedModules != NULL) {
+			dbgprintf("modules still loaded after module.UnloadAndDestructAll:\n");
+			modUsrPrintAll();
+		}
+#	endif
+
 	RETiRet;
 }