From a69a015189422fca6d685f5b6271d9d0ba3152d4 Mon Sep 17 00:00:00 2001
From: Vincent Herbet <github@arkshine.me>
Date: Mon, 27 Nov 2017 12:08:51 +0100
Subject: [PATCH] Fix open_dir not working properly when called recursively
 (#467)

---
 amxmodx/file.cpp | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/amxmodx/file.cpp b/amxmodx/file.cpp
index 9626df33..2f92bf2b 100755
--- a/amxmodx/file.cpp
+++ b/amxmodx/file.cpp
@@ -744,10 +744,16 @@ enum FileType
 
 struct DirectoryHandle
 {
-	DirectoryHandle(void* handle_, bool valvefs_) : handle(handle_), valvefs(valvefs_) {}
+	DirectoryHandle(CDirectory *handle_) : handle(handle_), valvefs(false) {}
+	DirectoryHandle(FileFindHandle_t handle_) : handle_vfs(handle_), valvefs(true) {}
 
-	void* handle;
-	bool  valvefs;
+	union
+	{
+		CDirectory*      handle;
+		FileFindHandle_t handle_vfs;
+	};
+
+	bool valvefs;
 };
 
 // native open_dir(dir[], firstfile[], length, &FileType:type = FileType_Unknown, bool:use_valve_fs=false, const valve_path_id[] = "GAME");
@@ -768,7 +774,7 @@ static cell AMX_NATIVE_CALL amx_open_dir(AMX *amx, cell *params)
 		const char* wildcardedPath = g_LibSys.PathFormat("%s%s*", path, (path[length - 1] != '/' && path[length - 1] != '\\') ? "/" : "");
 		const char* pathID = get_amxstring_null(amx, params[6], 1, length);
 
-		static FileFindHandle_t handle;
+		FileFindHandle_t handle;
 		const char* pFirst = g_FileSystem->FindFirst(wildcardedPath, &handle, pathID);
 
 		if (!pFirst)
@@ -781,7 +787,7 @@ static cell AMX_NATIVE_CALL amx_open_dir(AMX *amx, cell *params)
 
 		*fileType = g_FileSystem->FindIsDirectory(handle) ? FileType_Directory : FileType_File;
 
-		return reinterpret_cast<cell>(new DirectoryHandle(reinterpret_cast<void*>(&handle), true));
+		return reinterpret_cast<cell>(new DirectoryHandle(handle));
 	}
 
 	CDirectory* dir = g_LibSys.OpenDirectory(build_pathname("%s", path));
@@ -800,7 +806,7 @@ static cell AMX_NATIVE_CALL amx_open_dir(AMX *amx, cell *params)
 	const char* entry = dir->GetEntryName();
 	set_amxstring_utf8(amx, params[2], entry, strlen(entry), params[3]);
 
-	return reinterpret_cast<cell>(new DirectoryHandle(reinterpret_cast<void*>(dir), false));
+	return reinterpret_cast<cell>(new DirectoryHandle(dir));
 }
 
 // native close_dir(dirh);
@@ -815,8 +821,8 @@ static cell AMX_NATIVE_CALL amx_close_dir(AMX *amx, cell *params)
 
 	if (p->valvefs)
 	{
-		FileFindHandle_t* handle = reinterpret_cast<FileFindHandle_t*>(p->handle);
-		g_FileSystem->FindClose(*handle);
+		FileFindHandle_t handle = p->handle_vfs;
+		g_FileSystem->FindClose(handle);
 	}
 	else
 	{
@@ -841,14 +847,9 @@ static cell AMX_NATIVE_CALL amx_get_dir(AMX *amx, cell *params)
 
 	if (p->valvefs)
 	{
-		FileFindHandle_t* handle = reinterpret_cast<FileFindHandle_t*>(p->handle);
+		FileFindHandle_t handle = p->handle_vfs;
 
-		if (!handle)
-		{
-			return 0;
-		}
-
-		const char* entry = g_FileSystem->FindNext(*handle);
+		const char* entry = g_FileSystem->FindNext(handle);
 
 		if (!entry)
 		{
@@ -858,14 +859,14 @@ static cell AMX_NATIVE_CALL amx_get_dir(AMX *amx, cell *params)
 		if (numParams >= 4)
 		{
 			cell* fileType = get_amxaddr(amx, params[4]);
-			*fileType = g_FileSystem->FindIsDirectory(*handle) ? FileType_Directory : FileType_File;
+			*fileType = g_FileSystem->FindIsDirectory(handle) ? FileType_Directory : FileType_File;
 		}
 
 		set_amxstring_utf8(amx, params[2], entry, strlen(entry), params[3]);
 	}
 	else
 	{
-		CDirectory* handle = reinterpret_cast<CDirectory*>(p->handle);
+		CDirectory* handle = p->handle;
 
 		if (!handle)
 		{