From 8db3191f04d52929ec10b1412d282a4ac4cf5240 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bert=20M=C3=BCnnich?= Date: Wed, 1 Oct 2014 20:25:36 +0200 Subject: Fixed segfault on image removal with uninitialized thumbnails; fixes issue #177 --- Makefile | 2 +- main.c | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 73730f4..bc99590 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -VERSION = git-20140930 +VERSION = git-20141001 PREFIX = /usr/local MANPREFIX = $(PREFIX)/share/man diff --git a/main.c b/main.c index 2631c05..31effbd 100644 --- a/main.c +++ b/main.c @@ -177,12 +177,13 @@ void remove_file(int n, bool manual) free((void*) files[n].name); if (n + 1 < filecnt) { - memmove(files + n, files + n + 1, (filecnt - n - 1) * sizeof(fileinfo_t)); - memmove(tns.thumbs + n, tns.thumbs + n + 1, (filecnt - n - 1) * - sizeof(thumb_t)); - memset(tns.thumbs + filecnt - 1, 0, sizeof(thumb_t)); + if (tns.thumbs != NULL) { + memmove(tns.thumbs + n, tns.thumbs + n + 1, (filecnt - n - 1) * + sizeof(*tns.thumbs)); + memset(tns.thumbs + filecnt - 1, 0, sizeof(*tns.thumbs)); + } + memmove(files + n, files + n + 1, (filecnt - n - 1) * sizeof(*files)); } - filecnt--; if (fileidx >= filecnt) fileidx = filecnt - 1; -- cgit v1.2.3