Fix minor memory leaks in traverse_dir() and find_flag_file()

XQF · Aug 30, 2018 · 036dc2b · 036dc2b
1 parent ae7a444
commit 036dc2b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/country-filter.c b/src/country-filter.c
@@ -159,6 +159,7 @@ int geoip_id_by_ip(struct in_addr in) {
 
 static char* find_flag_file(int id) {
 	gchar file[] = "flags/lan.png";
+	gchar* file_lwr;
 	gchar* filename;
 
 	if (id != LAN_GeoIPid) {
@@ -168,7 +169,9 @@ static char* find_flag_file(int id) {
 		strcpy(file+strlen("flags/")+2, ".png");
 	}
 
-	filename = find_pixmap_directory(g_ascii_strdown(file, -1));
+	file_lwr = g_ascii_strdown(file, -1);
+	filename = find_pixmap_directory(file_lwr);
+	g_free(file_lwr);
 
 	return filename;
 }

diff --git a/src/q3maps.c b/src/q3maps.c
@@ -525,12 +525,11 @@ void traverse_dir(const char* startdir, FoundFileFunction found_file, FoundDirFu
 	dirstack = g_slist_prepend(dirstack, dse);
 
 	while (dirstack) {
-		GSList* current = dirstack;
-		dirstack = g_slist_remove_link(dirstack, dirstack);
-
-		dse = current->data;
+		dse = dirstack->data;
 		curdir = dse->name;
 
+		dirstack = g_slist_delete_link(dirstack, dirstack);
+
 		dir = opendir(curdir);
 		if (!dir) {
 			perror(curdir);