input: Free instance-private storage at instance free.

diff --git a/src/input/binary.c b/src/input/binary.c
index 15dc0da191702b75291377d4ae05bcd621f1f83e..e3b2d243f080ee845c37d6cac77bb5db105048ed 100644 (file)
--- a/src/input/binary.c
+++ b/src/input/binary.c
@@ -133,8 +133,6 @@ static int cleanup(struct sr_input *in)
                packet.type = SR_DF_END;
                sr_session_send(in->sdi, &packet);
        }
-       g_free(in->priv);
-       in->priv = NULL;
 
        return SR_OK;
 }

diff --git a/src/input/chronovu_la8.c b/src/input/chronovu_la8.c
index 9c82506a7584a27ce0841b72ae331dc457a6416c..727d68e94fa6ad956627dba44527d9fa215fda6a 100644 (file)
--- a/src/input/chronovu_la8.c
+++ b/src/input/chronovu_la8.c
@@ -145,8 +145,6 @@ static int cleanup(struct sr_input *in)
                packet.type = SR_DF_END;
                sr_session_send(in->sdi, &packet);
        }
-       g_free(in->priv);
-       in->priv = NULL;
 
        return SR_OK;
 }

diff --git a/src/input/csv.c b/src/input/csv.c
index c6aabd965e7347111b9a1c2328b9853203dd258c..fb284f86423f74aea6f43296df3e27713c2ed0f7 100644 (file)
--- a/src/input/csv.c
+++ b/src/input/csv.c
@@ -753,9 +753,6 @@ static int cleanup(struct sr_input *in)
        if (inc->sample_buffer)
                g_free(inc->sample_buffer);
 
-       g_free(inc);
-       in->priv = NULL;
-
        return SR_OK;
 }
 

diff --git a/src/input/input.c b/src/input/input.c
index 02f7db1b928c92bbed73f15e115d725c48c7b238..287fcede93c2fa12295fb9eb41d1e8dbccec2636 100644 (file)
--- a/src/input/input.c
+++ b/src/input/input.c
@@ -552,6 +552,7 @@ SR_API int sr_input_free(const struct sr_input *in)
        }
        if (in->buf)
                g_string_free(in->buf, TRUE);
+       g_free(in->priv);
        g_free((gpointer)in);
 
        return ret;

diff --git a/src/input/vcd.c b/src/input/vcd.c
index 9d164f9884567e810ad4ff1c51dca2d110ff8562..6854bf8114ca40dc94cb958248507f84d5824935 100644 (file)
--- a/src/input/vcd.c
+++ b/src/input/vcd.c
@@ -519,8 +519,6 @@ static int cleanup(struct sr_input *in)
        }
 
        g_slist_free_full(inc->channels, free_channel);
-       g_free(inc);
-       in->priv = NULL;
 
        return SR_OK;
 }

diff --git a/src/input/wav.c b/src/input/wav.c
index b6a7e5185add90c6eb2d8ccd7d69b4e285468a44..9eb5627f2ba49fbbf3c80b91ef575cd6fbeb20eb 100644 (file)
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -341,8 +341,6 @@ static int cleanup(struct sr_input *in)
                packet.type = SR_DF_END;
                sr_session_send(in->sdi, &packet);
        }
-       g_free(in->priv);
-       in->priv = NULL;
 
        return SR_OK;
 }