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

This commit is contained in:
DDuarte
2014-09-29 19:29:54 +01:00

View File

@@ -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;
}
}