Fix memory leak.

Author: jhe2

src/dir.c

@@ -44,6 +44,7 @@ static int select_file(const struct dirent *de)
 
 void dir_init(Dir *dir)
 {
+	dir->entries = 0;
 	dir->files = 0;
 	dir->ep = NULL;
 	dir->path[0] = '\0';
@@ -78,11 +79,12 @@ int dir_read(Dir *dir, char *path, int directories_first)
 		new_path = dir_get_new_dir_alloc(dir->path, path);
 		wdprintf(V_DEBUG, "dir", "old path=%s\nnew path=%s\n", dir->path, new_path);
 		if (new_path && strncmp(new_path, dir->base_dir, strlen(dir->base_dir)) == 0) {
-			dir->files = 0;
 			memset(dir->path, 0, 256);
 			strncpy(dir->path, new_path, 255);
 			wdprintf(V_DEBUG, "dir", "scanning path=[%s]\n", dir->path);
-			dir->files = scandir(dir->path, &(dir->ep), select_file, alphasort);
+			dir_free(dir);
+			dir->entries = scandir(dir->path, &(dir->ep), select_file, alphasort);
+			dir->files = dir->entries;
 			wdprintf(V_DEBUG, "dir", "files found=%d\n", dir->files);
 			if (dir->files > MAX_FILES) dir->files = MAX_FILES;
 			for (i = 0; i < dir->files; i++) {
@@ -160,7 +162,7 @@ void dir_free(Dir *dir)
 	struct dirent **list;
 
 	if (dir->ep) {
-		for (i = 0, list = dir->ep; i < dir->files; i++, list++)
+		for (i = 0, list = dir->ep; i < dir->entries; i++, list++)
 			free(*list);
 		free(dir->ep);
 		dir->ep = NULL;

src/dir.h

@@ -21,7 +21,8 @@
 struct _Dir
 {
 	struct dirent **ep;
-	int             files;
+	/* "entries" contains all fetched files, while "files" contains the number of visible files */
+	int             entries, files;
 	short           flag_tmp[MAX_FILES];
 	short           flag[MAX_FILES];
 	long            filesize_tmp[MAX_FILES];

src/frontends/sdl/filebrowser.c

@@ -34,6 +34,11 @@ void file_browser_init(FileBrowser *fb, const Skin *skin, Charset charset, char
 	dir_set_base_dir(&(fb->dir), base_dir);
 }
 
+void file_browser_free(FileBrowser *fb)
+{
+	dir_free(&(fb->dir));
+}
+
 void file_browser_set_directories_first(FileBrowser *fb, int value)
 {
 	fb->directories_first = value;

src/frontends/sdl/filebrowser.h

@@ -27,6 +27,7 @@ typedef struct FileBrowser
 } FileBrowser;
 
 void    file_browser_init(FileBrowser *fb, const Skin *skin, Charset charset, char *base_dir);
+void    file_browser_free(FileBrowser *fb);
 int     file_browser_set_selection(FileBrowser *fb, int selection);
 int     file_browser_get_selection(FileBrowser *fb);
 void    file_browser_move_selection_down(FileBrowser *fb);

src/frontends/sdl/sdl.c

@@ -1283,7 +1283,7 @@ static void run_player(char *skin_name, char *decoders_str)
 			}
 			cfg_add_key(config, "SDL_frontend.Fullscreen", fullscreen ? "yes" : "no");
 		}
-		/*dir_free(&fb.dir);*/
+		file_browser_free(&fb);
 		cover_viewer_free(&cv);
 		skin_free(&skin);
 	}