mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2025-11-03 09:01:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #80 from SyedAmerGilani/fix_memory_leaks

Browse source 
fix a few possible memory leaks
This commit is contained in:
Drew DeVault 2015-08-19 07:01:14 -04:00
commit ae367c5af4
3 changed files with 20 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sway/commands.c
View file

@ -105,6 +105,10 @@ static bool cmd_bindsym(struct sway_config *config, int argc, char **argv) {
xkb_keysym_t sym = xkb_keysym_from_name(split->items[i], XKB_KEYSYM_CASE_INSENSITIVE); xkb_keysym_t sym = xkb_keysym_from_name(split->items[i], XKB_KEYSYM_CASE_INSENSITIVE);
if (!sym) { if (!sym) {
sway_log(L_ERROR, "bindsym - unknown key %s", (char *)split->items[i]); sway_log(L_ERROR, "bindsym - unknown key %s", (char *)split->items[i]);
list_free(binding->keys);
free(binding->command);
free(binding);
list_free(split);
return false; return false;
} }
xkb_keysym_t *key = malloc(sizeof(xkb_keysym_t)); xkb_keysym_t *key = malloc(sizeof(xkb_keysym_t));

6
sway/config.c
View file

@ -28,6 +28,7 @@ static char *get_config_path() {
if (exists(temp)) { if (exists(temp)) {
return temp; return temp;
} }
free(temp);
// Check XDG_CONFIG_HOME with fallback to ~/.config/ // Check XDG_CONFIG_HOME with fallback to ~/.config/
sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_HOME/sway/config"); sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_HOME/sway/config");
@ -54,6 +55,7 @@ static char *get_config_path() {
if (exists(temp)) { if (exists(temp)) {
return temp; return temp;
} }
free(temp);
// Check XDG_CONFIG_DIRS // Check XDG_CONFIG_DIRS
sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_DIRS"); sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_DIRS");
@ -70,6 +72,7 @@ static char *get_config_path() {
free_flat_list(paths); free_flat_list(paths);
return temp; return temp;
} }
free(temp);
} }
free_flat_list(paths); free_flat_list(paths);
} }
@ -83,6 +86,7 @@ static char *get_config_path() {
if (exists(temp)) { if (exists(temp)) {
return temp; return temp;
} }
free(temp);
sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_HOME/i3/config"); sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_HOME/i3/config");
if (xdg_config_home == NULL) { if (xdg_config_home == NULL) {
@ -106,6 +110,7 @@ static char *get_config_path() {
if (exists(temp)) { if (exists(temp)) {
return temp; return temp;
} }
free(temp);
sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_DIRS"); sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_DIRS");
if (xdg_config_dirs != NULL) { if (xdg_config_dirs != NULL) {
@ -120,6 +125,7 @@ static char *get_config_path() {
free_flat_list(paths); free_flat_list(paths);
return temp; return temp;
} }
free(temp);
} }
free_flat_list(paths); free_flat_list(paths);
} }

15
sway/workspace.c
View file

@ -31,7 +31,7 @@ char *workspace_next_name(void) {
char* target = malloc(strlen(args->items[1]) + 1); char* target = malloc(strlen(args->items[1]) + 1);
strcpy(target, args->items[1]); strcpy(target, args->items[1]);
while (*target == ' ' || *target == '\t') while (*target == ' ' || *target == '\t')
target++; target++;
// Make sure that the command references an actual workspace // Make sure that the command references an actual workspace
// not a command about workspaces // not a command about workspaces
@ -42,11 +42,15 @@ char *workspace_next_name(void) {
strcmp(target, "number") == 0 || strcmp(target, "number") == 0 ||
strcmp(target, "back_and_forth") == 0 || strcmp(target, "back_and_forth") == 0 ||
strcmp(target, "current") == 0) strcmp(target, "current") == 0)
{
list_free(args);
continue; continue;
}
//Make sure that the workspace doesn't already exist
//Make sure that the workspace doesn't already exist
if (workspace_find_by_name(target)) { if (workspace_find_by_name(target)) {
continue; list_free(args);
continue;
} }
list_free(args); list_free(args);
@ -54,6 +58,7 @@ char *workspace_next_name(void) {
sway_log(L_DEBUG, "Workspace: Found free name %s", target); sway_log(L_DEBUG, "Workspace: Found free name %s", target);
return target; return target;
} }
list_free(args);
} }
// As a fall back, get the current number of active workspaces // As a fall back, get the current number of active workspaces
// and return that + 1 for the next workspace's name // and return that + 1 for the next workspace's name
@ -77,7 +82,7 @@ swayc_t *workspace_create(const char* name) {
} }
bool workspace_by_name(swayc_t *view, void *data) { bool workspace_by_name(swayc_t *view, void *data) {
return (view->type == C_WORKSPACE) && return (view->type == C_WORKSPACE) &&
(strcasecmp(view->name, (char *) data) == 0); (strcasecmp(view->name, (char *) data) == 0);
} }