From 4afe67cdc8063e6e4f3b0ec75bef81b9af484443 Mon Sep 17 00:00:00 2001 From: ocornut Date: Wed, 24 Feb 2016 11:50:21 +0100 Subject: [PATCH] Demo: Fixed malloc/free mismatch and leak when destructing demo console (if it has been used) (#536) --- imgui_demo.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/imgui_demo.cpp b/imgui_demo.cpp index f0b460fc..229cd533 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -1890,14 +1890,14 @@ struct ExampleAppConsole ~ExampleAppConsole() { ClearLog(); - for (int i = 0; i < Items.Size; i++) + for (int i = 0; i < History.Size; i++) free(History[i]); } // Portable helpers static int Stricmp(const char* str1, const char* str2) { int d; while ((d = toupper(*str2) - toupper(*str1)) == 0 && *str1) { str1++; str2++; } return d; } static int Strnicmp(const char* str1, const char* str2, int n) { int d = 0; while (n > 0 && (d = toupper(*str2) - toupper(*str1)) == 0 && *str1) { str1++; str2++; n--; } return d; } - static char* Strdup(const char *str) { size_t len = strlen(str) + 1; void* buff = ImGui::MemAlloc(len); return (char*)memcpy(buff, (const void*)str, len); } + static char* Strdup(const char *str) { size_t len = strlen(str) + 1; void* buff = malloc(len); return (char*)memcpy(buff, (const void*)str, len); } void ClearLog() {