From 54b81ed2d1c54e50b240cfcbe1bab1a1e6f1e833 Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@amcrypto.jp>
Date: Sat, 13 Sep 2025 15:26:53 +0900
Subject: [PATCH] Windows driver: add defensive checks to TCCloseVolume
 implementation

---
 src/Driver/Ntvol.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Driver/Ntvol.c b/src/Driver/Ntvol.c
index 2daebfd7..470d50c8 100644
--- a/src/Driver/Ntvol.c
+++ b/src/Driver/Ntvol.c
@@ -910,8 +910,13 @@ void TCCloseVolume (PDEVICE_OBJECT DeviceObject, PEXTENSION Extension)
 			RestoreTimeStamp (Extension);
 		}
 		ZwClose (Extension->hDeviceFile);
+		Extension->hDeviceFile = NULL;
+	}
+	if (Extension->pfoDeviceFile != NULL)
+	{
+		ObDereferenceObject (Extension->pfoDeviceFile);
+		Extension->pfoDeviceFile = NULL;
 	}
-	ObDereferenceObject (Extension->pfoDeviceFile);
 	if (Extension->cryptoInfo)
 	{
 		crypto_close (Extension->cryptoInfo);