Commit eaceb6aa authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

fix a memory leak when loading a non-native image more than once 

feh_file_info_load is called even if file_info is already populated, so
the original file_info struct is never freed. This results in a leak of
~44 Byte for each subsequenc image load
parent 82547255

src/imlib.c

+12 −0
Original line number Diff line number Diff line
@@ -254,7 +254,19 @@ int feh_load_image(Imlib_Image * im, feh_file * file) 
		if (!err && im) {

			real_filename = file->filename;

			file->filename = tmpname;



			/*

			 * feh does not associate a non-native image with its temporary

			 * filename and may delete the temporary file right after loading.

			 * To ensure that it is still aware of image size, dimensions, etc.,

			 * file_info is preloaded here. To avoid a memory leak when loading

			 * a non-native file multiple times in a slideshow, the file_info

			 * struct is freed first. If file->info is not set, feh_file_info_free

			 * is a no-op.

			 */

			feh_file_info_free(file->info);

			feh_file_info_load(file, *im);



			file->filename = real_filename;

#ifdef HAVE_LIBEXIF

			file->ed = exif_get_data(tmpname);