gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-18 12:00:31 +01:00
Code Issues Projects Releases Wiki Activity

Fixed memory leak due to non-freed property list structure

Browse Source 
The history is actually loaded from a file into a property list that
is then converted to an array. The intermediate property list was
not freed, which led to memory leak.

It looks like it was a tentative of optimisation to avoid duplicating
an already allocated string and re-use the pointer instead, but this
means it is not possible to free the original container as it would
free the string too.

There is a better way to do this, but it requires an API change on the
WUtil library so it is left for a future improvment.
This commit is contained in:
Christophe CURIS
2013-05-08 15:44:12 +02:00
committed by Carlos R. Mafra
parent 5a5216ffb9
commit af403073f0
1 changed files with 23 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/dialog.c
View File

@@ -191,24 +191,38 @@ static WMArray *LoadHistory(const char *filename, int max)
WMPropList *plitem;
WMArray *history;
int i, num;
char *str;
history = WMCreateArrayWithDestructor(1, wfree);
WMAddToArray(history, wstrdup(""));
plhistory = WMReadPropListFromFile(filename);
if (plhistory && WMIsPLArray(plhistory)) {
num = WMGetPropListItemCount(plhistory);
if (plhistory) {
if (WMIsPLArray(plhistory)) {
num = WMGetPropListItemCount(plhistory);
for (i = 0; i < num; ++i) {
plitem = WMGetFromPLArray(plhistory, i);
if (WMIsPLString(plitem) && WMFindInArray(history, strmatch,
WMGetFromPLString(plitem)) == WANotFound) {
WMAddToArray(history, WMGetFromPLString(plitem));
if (--max <= 0)
break;
for (i = 0; i < num; ++i) {
plitem = WMGetFromPLArray(plhistory, i);
if (WMIsPLString(plitem)) {
str = WMGetFromPLString(plitem);
if (WMFindInArray(history, strmatch, str) == WANotFound) {
/*
* The string here is duplicated because it will be freed
* automatically when the array is deleted. This is not really
* great because it is already an allocated string,
* unfortunately we cannot re-use it because it will be freed
* when we discard the PL (and we don't want to waste the PL's
* memory either)
*/
WMAddToArray(history, wstrdup(str));
if (--max <= 0)
break;
}
}
}
}
WMReleasePropList(plhistory);
}
return history;