From ee0c0e8c442bd7fc805a70d7b4816a803303826f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Voltz?= Date: Thu, 10 Jun 2010 21:45:56 +0200 Subject: [PATCH] fix calibration file name free --- ChangeLog | 4 ++++ backend/genesys.c | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 5071fc01d..7bc8a1635 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-06-10 Stéphane Voltz + * backend/genesys.c: + calibration file name double free fix + 2010-06-10 m. allan noah * backend/niash.c: patch for HP3300 from Yves Jeanrenaud * po/fr.po: updates from Yann E. MORIN diff --git a/backend/genesys.c b/backend/genesys.c index 0be94c00f..04cf48418 100644 --- a/backend/genesys.c +++ b/backend/genesys.c @@ -6922,7 +6922,7 @@ sane_open (SANE_String_Const devicename, SANE_Handle * handle) { sprintf (tmp_str, "%s/.sane/%s.cal", ptr, s->dev->model->name); } - FREE_IFNOT_NULL (s->dev->calib_file); + s->dev->calib_file = strdup (tmp_str); DBG (DBG_info, "Calibration filename set to:\n"); DBG (DBG_info, ">%s<\n", s->dev->calib_file); @@ -6980,6 +6980,7 @@ sane_close (SANE_Handle handle) sanei_genesys_buffer_free (&(s->dev->out_buffer)); FREE_IFNOT_NULL (s->dev->white_average_data); FREE_IFNOT_NULL (s->dev->dark_average_data); + FREE_IFNOT_NULL (s->dev->calib_file); /* free allocated gamma tables */ FREE_IFNOT_NULL (s->dev->sensor.red_gamma_table);