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

Fix some potential memory leaks

This commit is contained in:
Peter Bui 2011-08-08 21:44:39 -04:00 committed by Michael Stapelberg
parent 6fb5d6e313
commit 5e06b1b21d
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/assignments.c
View File

@ -39,7 +39,9 @@ void run_assignments(i3Window *window) {
DLOG("execute command %s\n", current->dest.command); DLOG("execute command %s\n", current->dest.command);
char *full_command; char *full_command;
asprintf(&full_command, "[id=\"%d\"] %s", window->id, current->dest.command); asprintf(&full_command, "[id=\"%d\"] %s", window->id, current->dest.command);
parse_cmd(full_command); char *json_result = parse_cmd(full_command);
FREE(full_command);
FREE(json_result);
} }
/* Store that we ran this assignment to not execute it again */ /* Store that we ran this assignment to not execute it again */

1
src/cfgparse.y
View File

@ -1101,6 +1101,7 @@ colorpixel:
char *hex; char *hex;
if (asprintf(&hex, "#%s", $2) == -1) if (asprintf(&hex, "#%s", $2) == -1)
die("asprintf()"); die("asprintf()");
free($2);
$$ = get_colorpixel(hex); $$ = get_colorpixel(hex);
free(hex); free(hex);
} }

1
src/config.c
View File

@ -193,6 +193,7 @@ static char *get_config_path(const char *override_configpath) {
config_path = resolve_tilde("~/.i3/config"); config_path = resolve_tilde("~/.i3/config");
if (path_exists(config_path)) if (path_exists(config_path))
return config_path; return config_path;
free(config_path);
/* 2: check for $XDG_CONFIG_HOME/i3/config */ /* 2: check for $XDG_CONFIG_HOME/i3/config */
if ((xdg_config_home = getenv("XDG_CONFIG_HOME")) == NULL) if ((xdg_config_home = getenv("XDG_CONFIG_HOME")) == NULL)

3
src/handlers.c
View File

@ -112,7 +112,8 @@ static int handle_key_press(xcb_key_press_event_t *event) {
} }
} }
parse_cmd(bind->command); char *json_result = parse_cmd(bind->command);
free(json_result);
return 1; return 1;
} }

5
src/ipc.c
View File

@ -147,7 +147,8 @@ IPC_HANDLER(command) {
char *command = scalloc(message_size + 1); char *command = scalloc(message_size + 1);
strncpy(command, (const char*)message, message_size); strncpy(command, (const char*)message, message_size);
LOG("IPC: received: *%s*\n", command); LOG("IPC: received: *%s*\n", command);
const char *reply = parse_cmd((const char*)command); char *reply = parse_cmd((const char*)command);
char *save_reply = reply;
free(command); free(command);
/* If no reply was provided, we just use the default success message */ /* If no reply was provided, we just use the default success message */
@ -155,6 +156,8 @@ IPC_HANDLER(command) {
reply = "{\"success\":true}"; reply = "{\"success\":true}";
ipc_send_message(fd, (const unsigned char*)reply, ipc_send_message(fd, (const unsigned char*)reply,
I3_IPC_REPLY_TYPE_COMMAND, strlen(reply)); I3_IPC_REPLY_TYPE_COMMAND, strlen(reply));
FREE(save_reply);
} }
static void dump_rect(yajl_gen gen, const char *name, Rect r) { static void dump_rect(yajl_gen gen, const char *name, Rect r) {