Commit 47cef573 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Fix memory leak in cb_reload_timer (--reload for directories) (closes #62) 

Patch by livibetter
parent ed5f55e9

ChangeLog

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ git HEAD 
      <https://github.com/derf/feh/issues/5>

    * Fix segfault when reloading no longer loadable (but still existing) images.

      feh will now display a warning and try to reload ad infinitum

    * Fix memory leak in reload functionality for directories

      <https://github.com/derf/feh/issues/62>



Tue, 16 Aug 2011 22:48:06 +0200  Daniel Friesel <derf@finalrewind.org>

src/slideshow.c

+6 −2
Original line number Diff line number Diff line
@@ -96,6 +96,11 @@ void cb_reload_timer(void *data) 


	/* save the current filename for refinding it in new list */

	current_filename = estrdup(FEH_FILE(current_file->data)->filename);



	for (l = filelist; l; l = l->next) {

		feh_file_free(l->data);

		l->data = NULL;

	}

	gib_list_free_and_data(filelist);

	filelist = NULL;

	filelist_len = 0;
@@ -109,8 +114,7 @@ void cb_reload_timer(void *data) 
		add_file_to_filelist_recursively(".", FILELIST_FIRST);

	

	if (!(filelist_len = gib_list_length(filelist))) {

		fprintf(stderr, "No files found to reload.\n");

		exit(1);

		eprintf("No files found to reload.");

	}



	/* find the previously current file */