koma/i3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix some memory leaks when user passes command line arguments twice (Thanks Tiago)

Browse Source
This commit is contained in:
Michael Stapelberg
2011-01-12 10:12:24 +01:00
parent a6f0dcd250
commit cd2ee61ee8
4 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
i3-input/i3-input.h
View File

@ -4,6 +4,13 @@
#include <err.h>
#define die(...) errx(EXIT_FAILURE, __VA_ARGS__);
#define FREE(pointer) do { \
if (pointer != NULL) { \
free(pointer); \
pointer = NULL; \
} \
} \
while (0)
char *convert_ucs_to_utf8(char *input);
char *convert_utf8_to_ucs2(char *input, int *real_strlen);

4
i3-input/main.c
View File

@ -261,21 +261,25 @@ int main(int argc, char *argv[]) {
while ((o = getopt_long(argc, argv, options_string, long_options, &option_index)) != -1) {
switch (o) {
case 's':
FREE(socket_path);
socket_path = strdup(optarg);
break;
case 'v':
printf("i3-input " I3_VERSION);
return 0;
case 'p':
FREE(command_prefix);
command_prefix = strdup(optarg);
break;
case 'l':
limit = atoi(optarg);
break;
case 'P':
FREE(prompt);
prompt = strdup(optarg);
break;
case 'f':
FREE(pattern);
pattern = strdup(optarg);
break;
case 'h':