summaryrefslogtreecommitdiff
path: root/src/winwidget.c
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2020-12-05 21:28:11 +0100
committerDaniel Friesel <derf@finalrewind.org>2020-12-05 22:00:45 +0100
commitd473ac13e7b70e8ad7a009a0f8c6d793934d03f1 (patch)
treea18702ab9080abc888ff48a0b2111b98c5e71dc7 /src/winwidget.c
parent35f60444fe55fa4717ac784931b3cb7455f7a369 (diff)
free accompanying EXIF data when freeing an image
This fixes two memory bugs that only manifest with exif=1 and long-running slideshows. * when feh loads an image, it writes exif data to file->ed. Previously, this data was never free'd, causing a memory leak on subsequent loads of the same file. * As file->ed is never free'd, the accumulated EXIF data consumes a significant amount of memory over time. with slideshow-delay = 10 and two days of runtime, feh may exceed 1 GB of memory usage. If the slideshow is so large that feh does not encounter the same image twice in this time, this is not detected as a memory leak, as each EXIF data chunk is referenced from the filelist. See <https://github.com/derf/feh/issues/553> for details. Closes #553
Diffstat (limited to 'src/winwidget.c')
-rw-r--r--src/winwidget.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/winwidget.c b/src/winwidget.c
index bfd987d..119c3af 100644
--- a/src/winwidget.c
+++ b/src/winwidget.c
@@ -1014,8 +1014,9 @@ void winwidget_rename(winwidget winwid, char *newname)
void winwidget_free_image(winwidget w)
{
- if (w->im)
+ if (w->im) {
gib_imlib_free_image(w->im);
+ }
w->im = NULL;
w->im_w = 0;
w->im_h = 0;