From f5f49e7a9deabd83303a7490cf606fb200c8af81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bert=20M=C3=BCnnich?= Date: Fri, 31 Oct 2014 10:37:35 +0100 Subject: [PATCH] Fixed leakage of resources allocated by EXIF library --- Makefile | 2 +- thumbs.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 2741601..c1ef1a8 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = git-20141029 +VERSION = git-20141031 PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man diff --git a/thumbs.c b/thumbs.c index a8f498b..3e6cc88 100644 --- a/thumbs.c +++ b/thumbs.c @@ -276,10 +276,10 @@ bool tns_load(tns_t *tns, int n, bool force) char tmppath[] = "/tmp/sxiv-XXXXXX"; Imlib_Image tmpim; - if ((ed = exif_data_new_from_file(file->path)) != NULL && - ed->data != NULL && ed->size > 0) - { - if ((tmpfd = mkstemp(tmppath)) >= 0) { + if ((ed = exif_data_new_from_file(file->path)) != NULL) { + if (ed->data != NULL && ed->size > 0 && + (tmpfd = mkstemp(tmppath)) >= 0) + { err = write(tmpfd, ed->data, ed->size) != ed->size; close(tmpfd);