From 01188b1501cfd4fc2f9ed46f8d86d1a29c708aae Mon Sep 17 00:00:00 2001 From: CairoLee Date: Mon, 4 Jan 2021 04:41:57 +0800 Subject: [PATCH] Fixed memory leak when using loadnpc or reloadnpcfile command (#5667) Fixes #5649 --- src/map/atcommand.cpp | 2 +- src/map/npc.cpp | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/map/atcommand.cpp b/src/map/atcommand.cpp index 424e92c732..5bab1834ca 100644 --- a/src/map/atcommand.cpp +++ b/src/map/atcommand.cpp @@ -4752,7 +4752,7 @@ ACMD_FUNC(loadnpc) npc_read_event_script(); - ShowStatus( "NPC file '" CL_WHITE "%s" CL_RESET "' was reloaded.\n", message ); + ShowStatus( "NPC file '" CL_WHITE "%s" CL_RESET "' was loaded.\n", message ); npc_event_doall_path( script_config.init_event_name, message ); clif_displaymessage(fd, msg_txt(sd,262)); // Script loaded. diff --git a/src/map/npc.cpp b/src/map/npc.cpp index 936f4e03a4..d0a00acb5c 100644 --- a/src/map/npc.cpp +++ b/src/map/npc.cpp @@ -581,6 +581,7 @@ int npc_event_doall_path( const char* event_name, const char* path ){ ShowStatus( "Event '" CL_WHITE "%s" CL_RESET "' executed with '" CL_WHITE "%d" CL_RESET "' NPCs.\n", event_name, count ); + mapit_free(iter); return count; }