From 55c0596c210d78f95439f11d9c7aa8cc6e969220 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 21 Mar 2018 13:00:06 +0100 Subject: [PATCH] Fix mismatched free/delete reported by Valgrind Reported errors are: Mismatched free() / delete / delete [] --- sqlines/sqlines.cpp | 2 +- sqlparser/dllmain.cpp | 4 ++-- sqlparser/token.cpp | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sqlines/sqlines.cpp b/sqlines/sqlines.cpp index 24dfd3e..b8ce6b4 100644 --- a/sqlines/sqlines.cpp +++ b/sqlines/sqlines.cpp @@ -245,7 +245,7 @@ int Sqlines::ProcessFile(std::string &file, std::string &out_file, int *in_size, if(in_lines != NULL) *in_lines = lines; - delete input; + delete [] input; return rc; } diff --git a/sqlparser/dllmain.cpp b/sqlparser/dllmain.cpp index 3698666..c653691 100644 --- a/sqlparser/dllmain.cpp +++ b/sqlparser/dllmain.cpp @@ -77,7 +77,7 @@ int CreateAssessmentReport(void *parser, const char *summary) // Free allocated result void FreeOutput(const char *output) { - delete output; + delete [] output; } #ifdef WIN32 @@ -96,4 +96,4 @@ BOOL APIENTRY DllMain( HMODULE /*hModule*/, DWORD ul_reason_for_call, LPVOID /* return TRUE; } -#endif \ No newline at end of file +#endif diff --git a/sqlparser/token.cpp b/sqlparser/token.cpp index 91779b3..fbc1d52 100644 --- a/sqlparser/token.cpp +++ b/sqlparser/token.cpp @@ -66,7 +66,7 @@ Token::~Token() } // Delete target values - delete t_str; + delete [] t_str; delete t_wstr; t_str = NULL; t_wstr = NULL; @@ -914,4 +914,4 @@ bool TokenStr::Compare(TokenStr *tokenstr, const char ch, const wchar_t /*wch*/, return true; return false; -} \ No newline at end of file +}