Merge remote-tracking branch 'origin/master' into 4.3.4

1 files changed, 4 insertions, 1 deletions

diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index cb77d7bd416..0bfa1da510a 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -104,7 +104,10 @@ class ScriptRegistry
                     // The script uses a script name from database, but isn't assigned to anything.
                     TC_LOG_ERROR("sql.sql", "Script named '%s' does not have a script name assigned in database.", script->GetName().c_str());
 
-                    delete script;
+                    // Avoid calling "delete script;" because we are currently in the script constructor
+                    // In a valid scenario this will not happen because every script has a name assigned in the database
+                    // If that happens, it's acceptable to just leak a few bytes
+
                     return;
                 }
             }