nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix memory leak when config conversion fails (#3006) 

This happens on an empty config file, for example.
This commit is contained in:
Michael Stapelberg 2017-09-30 10:15:58 -07:00 committed by GitHub
parent c08ef36199
commit 962750eb64
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/config_parser.c
View File

@ -764,6 +764,7 @@ static char *migrate_config(char *input, off_t size) {
wait(&status); wait(&status);
if (!WIFEXITED(status)) { if (!WIFEXITED(status)) {
fprintf(stderr, "Child did not terminate normally, using old config file (will lead to broken behaviour)\n"); fprintf(stderr, "Child did not terminate normally, using old config file (will lead to broken behaviour)\n");
FREE(converted);
return NULL; return NULL;
} }
@ -778,6 +779,7 @@ static char *migrate_config(char *input, off_t size) {
fprintf(stderr, "# i3 config file (v4)\n"); fprintf(stderr, "# i3 config file (v4)\n");
/* TODO: nag the user with a message to include a hint for i3 in their config file */ /* TODO: nag the user with a message to include a hint for i3 in their config file */
} }
FREE(converted);
return NULL; return NULL;
} }