From e94622c319e4307617b202f19d3ec05b21a9bb49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 27 Sep 2015 08:20:20 +0200 Subject: merge to 1.0.25+git20150927 --- backend/coolscan.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'backend/coolscan.c') diff --git a/backend/coolscan.c b/backend/coolscan.c index d3c7749..6828a16 100644 --- a/backend/coolscan.c +++ b/backend/coolscan.c @@ -1987,6 +1987,7 @@ static const SANE_Range shift_range = 0 }; +static const SANE_Device **devlist = 0; static int num_devices; static Coolscan_t *first_dev; @@ -3287,6 +3288,9 @@ sane_exit (void) free (dev->obuffer); free (dev); } + + if (devlist) + free (devlist); } /* ----------------------------- SANE GET DEVICES -------------------------- */ @@ -3294,8 +3298,6 @@ SANE_Status sane_get_devices (const SANE_Device *** device_list, SANE_Bool local_only) { - - static const SANE_Device **devlist = 0; Coolscan_t *dev; int i; -- cgit v1.2.3