1 files changed, 8 insertions, 3 deletions
diff --git a/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
index 88be5d7634..8de2eccc84 100644
--- a/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
+++ b/qpid/cpp/src/qpid/sys/windows/AsynchIO.cpp
@@ -754,9 +754,14 @@ void AsynchIO::completion(AsynchIoResult *result) {
         working = false;
     }
     // Lock released; ok to close if ops are done and close requested.
-    // Layer above will call back to queueForDeletion()
-    if (opsInProgress == 0 && queuedClose) {
-        close();
+    // Layer above will call back to queueForDeletion() if it hasn't
+    // already been done. If it already has, go ahead and delete.
+    if (opsInProgress == 0) {
+        if (queuedClose)
+            // close() may cause a delete; don't trust 'this' on return
+            close();
+        else if (queuedDelete)
+            delete this;
     }
 }