Fixed infinite error hook loop

Bumped revision number
danielga · Dec 16, 2021 · e8c9cee · e8c9cee
1 parent d03891b
commit e8c9cee
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/source/main.cpp b/source/main.cpp
@@ -12,11 +12,11 @@ GMOD_MODULE_OPEN( )
 {
 	LUA->CreateTable( );
 
-	LUA->PushString( "luaerror 1.5.6" );
+	LUA->PushString( "luaerror 1.5.7" );
 	LUA->SetField( -2, "Version" );
 
 	// version num follows LuaJIT style, xxyyzz
-	LUA->PushNumber( 10506 );
+	LUA->PushNumber( 10507 );
 	LUA->SetField( -2, "VersionNum" );
 
 #if defined LUAERROR_SERVER

diff --git a/source/shared.cpp b/source/shared.cpp
@@ -270,6 +270,9 @@ class CLuaGameCallback : public GarrysMod::Lua::ILuaGameCallback
 
 	void LuaError( const CLuaError *error )
 	{
+		if( entered_hook )
+			return callback->LuaError( error );
+
 		const int32_t funcs = LuaHelpers::PushHookRun( lua, "LuaError" );
 		if( funcs == 0 )
 			return callback->LuaError( error );
@@ -306,7 +309,10 @@ class CLuaGameCallback : public GarrysMod::Lua::ILuaGameCallback
 			lua->PushString( std::to_string( source_addon->wsid ).c_str( ) );
 		}
 
-		if( !LuaHelpers::CallHookRun( lua, 4 + args, 1 ) )
+		entered_hook = true;
+		const bool call_success = LuaHelpers::CallHookRun( lua, 4 + args, 1 );
+		entered_hook = false;
+		if( !call_success )
 			return callback->LuaError( error );
 
 		const bool proceed = !lua->IsType( -1, GarrysMod::Lua::Type::BOOL ) || !lua->GetBool( -1 );
@@ -339,6 +345,7 @@ class CLuaGameCallback : public GarrysMod::Lua::ILuaGameCallback
 private:
 	GarrysMod::Lua::CLuaInterface *lua;
 	GarrysMod::Lua::ILuaGameCallback *callback;
+	bool entered_hook = false;
 };
 
 static CLuaGameCallback callback;