From d2888e6cca5aa66d87f38f396b252f86c63f66fd Mon Sep 17 00:00:00 2001 From: "Michael Cook (mackal)" Date: Mon, 16 May 2016 23:22:23 -0400 Subject: [PATCH] Fix mismatched new/delete --- ucs/database.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/ucs/database.cpp b/ucs/database.cpp index 8cd1b73f5..c1721ffb9 100644 --- a/ucs/database.cpp +++ b/ucs/database.cpp @@ -200,19 +200,21 @@ bool Database::VerifyMailKey(std::string characterName, int IPAddress, std::stri return !strcmp(row[0], combinedKey); } -int Database::FindCharacter(const char *characterName) { - +int Database::FindCharacter(const char *characterName) +{ char *safeCharName = RemoveApostrophes(characterName); - std::string query = StringFormat("SELECT `id` FROM `character_data` WHERE `name`='%s' LIMIT 1", safeCharName); - auto results = QueryDatabase(query); + std::string query = StringFormat("SELECT `id` FROM `character_data` WHERE `name`='%s' LIMIT 1", safeCharName); + auto results = QueryDatabase(query); if (!results.Success()) { - safe_delete(safeCharName); + safe_delete_array(safeCharName); return -1; } - safe_delete(safeCharName); + + safe_delete_array(safeCharName); if (results.RowCount() != 1) { - Log.Out(Logs::Detail, Logs::UCS_Server, "Bad result from FindCharacter query for character %s", characterName); + Log.Out(Logs::Detail, Logs::UCS_Server, "Bad result from FindCharacter query for character %s", + characterName); return -1; } @@ -618,4 +620,4 @@ void Database::LoadLogSettings(EQEmuLogSys::LogSettings* log_settings){ Log.file_logs_enabled = true; } } -} \ No newline at end of file +}