Skip to content

Fix zenity memory issues #115

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: devel
Choose a base branch
from
Open

Fix zenity memory issues #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbd1f30
clang-format nfd_zenity.c
actondev May 29, 2025
8e08fb0
zenity: fix memory issues upon cancel
actondev May 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 24 additions & 22 deletions src/nfd_zenity.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,7 @@ AddFiltersToCommandArgs(char** commandArgs, int commandArgsLen, const char* filt
if (*p_filterList == ';' || *p_filterList == '\0') {
/* end of filter -- add it to the dialog */

for (i = 0; commandArgs[i] != NULL && i < commandArgsLen; i++)
;
for (i = 0; commandArgs[i] != NULL && i < commandArgsLen; i++);

commandArgs[i] = strdup(filterName);

Expand All @@ -81,8 +80,7 @@ AddFiltersToCommandArgs(char** commandArgs, int commandArgsLen, const char* filt

/* always append a wildcard option to the end*/

for (i = 0; commandArgs[i] != NULL && i < commandArgsLen; i++)
;
for (i = 0; commandArgs[i] != NULL && i < commandArgsLen; i++);

commandArgs[i] = strdup("--file-filter=*.*");
}
Expand All @@ -103,8 +101,7 @@ ZenityCommon(char** command,
strcat(tmp, defaultPath);

int i;
for (i = 0; command[i] != NULL && i < commandLen; i++)
;
for (i = 0; command[i] != NULL && i < commandLen; i++);

command[i] = tmp;
}
Expand Down Expand Up @@ -189,17 +186,18 @@ NFD_OpenDialog(const char* filterList, const nfdchar_t* defaultPath, nfdchar_t**
char* stdOut = NULL;
nfdresult_t result =
ZenityCommon(command, commandLen, defaultPath, filterList, &stdOut);

if (stdOut != NULL) {
size_t len = strlen(stdOut);
size_t len = (stdOut != NULL) ? strlen(stdOut) : 0;
if (len > 0) {
*outPath = NFDi_Malloc(len);
memcpy(*outPath, stdOut, len);
(*outPath)[len - 1] = '\0'; // trim out the final \n with a null terminator
free(stdOut);
} else {
*outPath = NULL;
}

if (stdOut != NULL)
free(stdOut);

return result;
}

Expand All @@ -222,18 +220,19 @@ NFD_OpenDialogMultiple(const nfdchar_t* filterList,
nfdresult_t result =
ZenityCommon(command, commandLen, defaultPath, filterList, &stdOut);

if (stdOut != NULL) {
size_t len = strlen(stdOut);
size_t len = (stdOut != NULL) ? strlen(stdOut) : 0;
if (len > 0) {
stdOut[len - 1] = '\0'; // remove trailing newline

if (AllocPathSet(stdOut, outPaths) == NFD_ERROR)
result = NFD_ERROR;

free(stdOut);
} else {
result = NFD_ERROR;
}

if (stdOut != NULL)
free(stdOut);

return result;
}

Expand All @@ -252,17 +251,18 @@ NFD_SaveDialog(const nfdchar_t* filterList, const nfdchar_t* defaultPath, nfdcha
char* stdOut = NULL;
nfdresult_t result =
ZenityCommon(command, commandLen, defaultPath, filterList, &stdOut);

if (stdOut != NULL) {
size_t len = strlen(stdOut);
size_t len = (stdOut != NULL) ? strlen(stdOut) : 0;
if (len > 0) {
*outPath = NFDi_Malloc(len);
memcpy(*outPath, stdOut, len);
(*outPath)[len - 1] = '\0'; // trim out the final \n with a null terminator
free(stdOut);
} else {
*outPath = NULL;
}

if (stdOut != NULL)
free(stdOut);

return result;
}

Expand All @@ -278,18 +278,20 @@ NFD_PickFolder(const nfdchar_t* defaultPath, nfdchar_t** outPath)
command[2] = strdup("--directory");
command[3] = strdup("--title=Select folder");

char* stdOut = NULL;
char* stdOut = NULL;
nfdresult_t result = ZenityCommon(command, commandLen, defaultPath, "", &stdOut);

if (stdOut != NULL) {
size_t len = strlen(stdOut);
size_t len = (stdOut != NULL) ? strlen(stdOut) : 0;
if (len > 0) {
*outPath = NFDi_Malloc(len);
memcpy(*outPath, stdOut, len);
(*outPath)[len - 1] = '\0'; // trim out the final \n with a null terminator
free(stdOut);
} else {
*outPath = NULL;
}

if (stdOut != NULL)
free(stdOut);

return result;
}