Fix use after free from unloading modules which are the last one holding onto an IdentifyRequest

1 files changed, 13 insertions, 1 deletions

diff --git a/src/account.cpp b/src/account.cpp
index e58ee1646..89c9c7909 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -73,8 +73,20 @@ void IdentifyRequest::ModuleUnload(Module *m)
 		IdentifyRequest *ir = *it;
 		++it;
 
-		ir->Release(m);
+		ir->holds.erase(m);
+		if (ir->holds.empty() && ir->dispatched)
+		{
+			if (!ir->success)
+				ir->OnFail();
+			delete ir;
+			continue;
+		}
+
 		if (ir->owner == m)
+		{
+			if (!ir->success)
+				ir->OnFail();
 			delete ir;
+		}
 	}
 }