pass net read

diff --git a/src/kds_s2000w_handler.c b/src/kds_s2000w_handler.c
index ddf10fff61a7d65fbf8d66111bfc65a26deaa38d..95bb70d89c2299ba268d57257ba8c0f82242902a 100644 (file)
--- 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 f9fe5dd00ac58296e90a85b1a2437e99f959fc71..990eb6fd12bde4490a0d60c6ba234ac8267d5c08 100644 (file)
--- 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 2ae8de38f9f1101457251550a9c67183c7f94690..254c11bfe1856b3ac0881f8df22cc0975c323e37 100644 (file)
--- 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