Merge pull request #164 from r00tcxx/master

Fix issue with ReadDirectoryChangesW API on Win32 when buffer overflows
SpartanJ · Aug 26, 2023 · 19398b8 · 19398b8
2 parents 6187b49 + 25a3346
commit 19398b8
Showing 1 changed file with 10 additions and 1 deletion.
diff --git a/src/efsw/WatcherWin32.cpp b/src/efsw/WatcherWin32.cpp
@@ -10,7 +10,8 @@ namespace efsw {
 
 /// Unpacks events and passes them to a user defined callback.
 void CALLBACK WatchCallback( DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOverlapped ) {
-	if ( dwNumberOfBytesTransfered == 0 || NULL == lpOverlapped ) {
+
+	if ( NULL == lpOverlapped ) {
 		return;
 	}
 
@@ -19,6 +20,14 @@ void CALLBACK WatchCallback( DWORD dwNumberOfBytesTransfered, LPOVERLAPPED lpOve
 	WatcherWin32* pWatch = tWatch->Watch;
 	size_t offset = 0;
 
+	if ( dwNumberOfBytesTransfered == 0 ) {
+		if ( nullptr != pWatch && !pWatch->StopNow ) {
+			RefreshWatch( tWatch );
+		} else {
+			return;
+		}
+	}
+
 	do {
 		bool skip = false;