1 files changed, 17 insertions, 20 deletions

diff --git a/source/client/client.c b/source/client/client.c
index 78c242af745..5df0cd1df43 100644
--- a/source/client/client.c
+++ b/source/client/client.c
@@ -370,10 +370,7 @@ functions for do_list_queue
  */
 static void reset_do_list_queue(void)
 {
-	if (do_list_queue)
-	{
-		free(do_list_queue);
-	}
+	SAFE_FREE(do_list_queue);
 	do_list_queue = 0;
 	do_list_queue_size = 0;
 	do_list_queue_start = 0;
@@ -711,7 +708,7 @@ static void do_get(char *rname,char *lname)
                rname, (long)nread));
 	}
 
-	free(data);
+	SAFE_FREE(data);
 	
 	if (!cli_close(cli, fnum)) {
 		DEBUG(0,("Error %s closing remote file\n",cli_errstr(cli)));
@@ -1048,13 +1045,13 @@ static void do_put(char *rname,char *lname)
 	if (!cli_close(cli, fnum)) {
 		DEBUG(0,("%s closing remote file %s\n",cli_errstr(cli),rname));
 		fclose(f);
-		if (buf) free(buf);
+		SAFE_FREE(buf);
 		return;
 	}
 
 	
 	fclose(f);
-	if (buf) free(buf);
+	SAFE_FREE(buf);
 
 	{
 		struct timeval tp_end;
@@ -1142,8 +1139,8 @@ static void free_file_list (struct file_list * list)
 	{
 		tmp = list;
 		DLIST_REMOVE(list, list);
-		if (tmp->file_path) free(tmp->file_path);
-		free(tmp);
+		SAFE_FREE(tmp->file_path);
+		SAFE_FREE(tmp);
 	}
 }
 
@@ -1213,7 +1210,7 @@ static int file_find(struct file_list **list, const char *directory,
 				}
 				
 				if (ret == -1) {
-					free(path);
+					SAFE_FREE(path);
 					closedir(dir);
 					return -1;
 				}
@@ -1228,7 +1225,7 @@ static int file_find(struct file_list **list, const char *directory,
 			entry->isdir = isdir;
                         DLIST_ADD(*list, entry);
 		} else {
-			free(path);
+			SAFE_FREE(path);
 		}
         }
 
@@ -1264,7 +1261,7 @@ static void cmd_mput(void)
 		for (temp_list = file_list; temp_list; 
 		     temp_list = temp_list->next) {
 
-			if (lname) free(lname);
+			SAFE_FREE(lname);
 			if (asprintf(&lname, "%s/", temp_list->file_path) <= 0)
 				continue;
 			trim_string(lname, "./", "/");
@@ -1273,7 +1270,7 @@ static void cmd_mput(void)
 			if (temp_list->isdir) {
 				/* if (!recurse) continue; */
 				
-				if (quest) free(quest);
+				SAFE_FREE(quest);
 				asprintf(&quest, "Put directory %s? ", lname);
 				if (prompt && !yesno(quest)) { /* No */
 					/* Skip the directory */
@@ -1281,7 +1278,7 @@ static void cmd_mput(void)
 					if (!seek_list(temp_list, lname))
 						break;		    
 				} else { /* Yes */
-	      				if (rname) free(rname);
+	      				SAFE_FREE(rname);
 					asprintf(&rname, "%s%s", cur_dir, lname);
 					dos_format(rname);
 					if (!cli_chkpath(cli, rname) && 
@@ -1295,13 +1292,13 @@ static void cmd_mput(void)
 				}
 				continue;
 			} else {
-				if (quest) free(quest);
+				SAFE_FREE(quest);
 				asprintf(&quest,"Put file %s? ", lname);
 				if (prompt && !yesno(quest)) /* No */
 					continue;
 				
 				/* Yes */
-				if (rname) free(rname);
+				SAFE_FREE(rname);
 				asprintf(&rname, "%s%s", cur_dir, lname);
 			}
 
@@ -1310,9 +1307,9 @@ static void cmd_mput(void)
 			do_put(rname, lname);
 		}
 		free_file_list(file_list);
-		if (quest) free(quest);
-		if (lname) free(lname);
-		if (rname) free(rname);
+		SAFE_FREE(quest);
+		SAFE_FREE(lname);
+		SAFE_FREE(rname);
 	}
 }
 
@@ -1876,7 +1873,7 @@ static char **completion_fn(const char *text, int start, int end)
 	}
 
 	if (count == 2) {
-		free(matches[0]);
+		SAFE_FREE(matches[0]);
 		matches[0] = strdup(matches[1]);
 	}
 	matches[count] = NULL;