From fa89d9033aa5795378a3326eff9d47bc720dd384 Mon Sep 17 00:00:00 2001 From: Christian Wieninger Date: Wed, 23 Jan 2013 20:05:40 +0100 Subject: fixed a memory leak, thanks to Sundararaj Reel for the patch --- HISTORY | 1 + HISTORY.DE | 1 + epgsearchtools.c | 5 +++-- epgsearchtools.h | 2 +- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/HISTORY b/HISTORY index 742f42d..9c35a02 100644 --- a/HISTORY +++ b/HISTORY @@ -23,6 +23,7 @@ new: - czech translation, thanks to Radek Stastny fixes: +- fixed a memory leak, thanks to Sundararaj Reel for the patch - fixed a crash when editing blacklists diff --git a/HISTORY.DE b/HISTORY.DE index 20be591..05a3db7 100644 --- a/HISTORY.DE +++ b/HISTORY.DE @@ -24,6 +24,7 @@ neu: - tschechische Übersetzung, Danke an Radek Stastny fixes: +- Speicherleck behoben, Danke an Sundararaj Reel für den Patch - Crash beim Editieren von Ausschlusslisten korrigiert diff --git a/epgsearchtools.c b/epgsearchtools.c index 3324f64..36f8474 100644 --- a/epgsearchtools.c +++ b/epgsearchtools.c @@ -86,11 +86,12 @@ int CompareSearchExtPrioDescTerm(const void *p1, const void *p2) return strcmp((*(cSearchExt **)p1)->search, (*(cSearchExt **)p2)->search); } -char* IndentMenuItem(const char* szString, int indentions) +cString IndentMenuItem(const char* szString, int indentions) { char* szIndented = NULL; msprintf(&szIndented, "%*s", strlen(szString)+indentions*2, szString); - return szIndented; + cString szIndentedStr(szIndented, true /*take pointer*/); + return szIndentedStr; } bool MatchesSearchMode(const char* szTest, const char* searchText, int mode, const char* delim, int tolerance) diff --git a/epgsearchtools.h b/epgsearchtools.h index fed2620..06e405d 100644 --- a/epgsearchtools.h +++ b/epgsearchtools.h @@ -121,7 +121,7 @@ class cSearchExt; class cSearchExtCat; class cEvent; -char* IndentMenuItem(const char*, int indentions=1); +cString IndentMenuItem(const char*, int indentions=1); bool MatchesSearchMode(const char* test, const char* values, int searchmode, const char* delim, int tolerance); char* GetExtEPGValue(const cEvent* e, cSearchExtCat* SearchExtCat); char* GetExtEPGValue(const char* description, const char* catname, const char *format); -- cgit v1.2.3