From: Bastian Dehn <hhaalo@arcor.de>
Date: Mon, 18 Mar 2024 19:15:49 +0000 (+0100)
Subject: pass net read
X-Git-Tag: v1.0.0^2~72^2~12
X-Git-Url: https://gitweb.hhaalo.de/?a=commitdiff_plain;h=17d1a06b7593b42ba4dc04bcef908b18752fdf12;p=sane-kds-s2000w-net.git

pass net read
---

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index ddf10ff..95bb70d 100644
--- a/src/kds_s2000w_handler.c
+++ b/src/kds_s2000w_handler.c
@@ -216,8 +216,6 @@ void free_handler(handler* h)
 	h->jpg_image->data = NULL;
 	free(h->jpg_image);
 	h->jpg_image = NULL;
-	free(h->pnm_image->data);
-	h->pnm_image->data = NULL;
 	free(h->pnm_image);
 	h->pnm_image = NULL;
 	free(h);
diff --git a/src/kds_s2000w_net.c b/src/kds_s2000w_net.c
index f9fe5dd..990eb6f 100644
--- a/src/kds_s2000w_net.c
+++ b/src/kds_s2000w_net.c
@@ -216,8 +216,6 @@ SANE_Status _sane_kds_s2000w_net_read(SANE_Handle handle, SANE_Byte* data,
 		free(h->jpg_image->data);
 		h->jpg_image->data = NULL;
 		h->pnm_image->size = 0;
-		free(h->pnm_image->data);
-		h->pnm_image->data = NULL;
 
 		return SANE_STATUS_EOF;
 	}
diff --git a/tests/kds_s2000w_net_read_tests.c b/tests/kds_s2000w_net_read_tests.c
index 2ae8de3..254c11b 100644
--- a/tests/kds_s2000w_net_read_tests.c
+++ b/tests/kds_s2000w_net_read_tests.c
@@ -67,7 +67,7 @@ void sane_kds_s2000w_net_read_empty_image()
 {
 	int length = 0;
 	handler* h = init_handler();
-	h->pnm_image->data = malloc(sizeof(char));;
+	h->pnm_image->data = malloc(sizeof(char));
 	h->pnm_image->size = 0;
 	char* dataptr = malloc(sizeof(char));
 
@@ -75,6 +75,8 @@ void sane_kds_s2000w_net_read_empty_image()
 
 	assert_int_equal(status, SANE_STATUS_EOF);
 
+	free(h->pnm_image->data);
+	h->pnm_image->data = NULL;
 	free(dataptr);
 	dataptr = NULL;
 	free_handler(h);
@@ -108,6 +110,8 @@ void sane_kds_s2000w_net_read_test()
 	dataptr = NULL;
 	free(length);
 	length = NULL;
+	free(h->pnm_image->data);
+	h->pnm_image->data = NULL;
 	free_handler(h);
 	h = NULL;
 }
@@ -139,6 +143,8 @@ void sane_kds_s2000w_net_read_bytes_per_line_bigger_test()
 	dataptr = NULL;
 	free(length);
 	length = NULL;
+	free(h->pnm_image->data);
+	h->pnm_image->data = NULL;
 	free_handler(h);
 	h = NULL;
 }
\ No newline at end of file