Merge pull request #80 from SyedAmerGilani/fix_memory_leaks

fix a few possible memory leaks

3 files changed, 20 insertions, 5 deletions

diff --git a/sway/commands.c b/sway/commands.c
index 42d6b173..ab24f6ae 100644
--- a/sway/commands.c
+++ b/sway/commands.c
@@ -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);
 		if (!sym) {
 			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;
 		}
 		xkb_keysym_t *key = malloc(sizeof(xkb_keysym_t));
diff --git a/sway/config.c b/sway/config.c
index 13280f9d..0dc53c75 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -28,6 +28,7 @@ static char *get_config_path() {
 	if (exists(temp)) {
 		return temp;
 	}
+	free(temp);
 
 	// Check XDG_CONFIG_HOME with fallback to ~/.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)) {
 		return temp;
 	}
+	free(temp);
 
 	// Check 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);
 				return temp;
 			}
+			free(temp);
 		}
 		free_flat_list(paths);
 	}
@@ -83,6 +86,7 @@ static char *get_config_path() {
 	if (exists(temp)) {
 		return temp;
 	}
+	free(temp);
 
 	sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_HOME/i3/config");
 	if (xdg_config_home == NULL) {
@@ -106,6 +110,7 @@ static char *get_config_path() {
 	if (exists(temp)) {
 		return temp;
 	}
+	free(temp);
 
 	sway_log(L_DEBUG, "Trying to find config in XDG_CONFIG_DIRS");
 	if (xdg_config_dirs != NULL) {
@@ -120,6 +125,7 @@ static char *get_config_path() {
 				free_flat_list(paths);
 				return temp;
 			}
+			free(temp);
 		}
 		free_flat_list(paths);
 	}
diff --git a/sway/workspace.c b/sway/workspace.c
index 60108752..180c8a66 100644
--- a/sway/workspace.c
+++ b/sway/workspace.c
@@ -31,7 +31,7 @@ char *workspace_next_name(void) {
 			char* target = malloc(strlen(args->items[1]) + 1);
 			strcpy(target, args->items[1]);
 			while (*target == ' ' || *target == '\t')
-				target++; 
+				target++;
 
 			// Make sure that the command references an actual workspace
 			// not a command about workspaces
@@ -42,11 +42,15 @@ char *workspace_next_name(void) {
 				strcmp(target, "number") == 0 ||
 				strcmp(target, "back_and_forth") == 0 ||
 				strcmp(target, "current") == 0)
+			{
+				list_free(args);
 				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)) {
-			   continue; 
+				list_free(args);
+				continue;
 			}
 
 			list_free(args);
@@ -54,6 +58,7 @@ char *workspace_next_name(void) {
 			sway_log(L_DEBUG, "Workspace: Found free name %s", target);
 			return target;
 		}
+		list_free(args);
 	}
 	// As a fall back, get the current number of active workspaces
 	// 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) {
-	return (view->type == C_WORKSPACE) && 
+	return (view->type == C_WORKSPACE) &&
 		   (strcasecmp(view->name, (char *) data) == 0);
 }