input: fix leak of config data in several input modules

[libsigrok.git] / src / input / wav.c

diff --git a/src/input/wav.c b/src/input/wav.c
index 0c23010eb6f7c5f1dab218356c54c1cf80a4a212..1b985edca632c3828ed4bd5ba6c857ede43c8bc6 100644 (file)
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -17,6 +17,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <config.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -24,7 +25,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <stdint.h>
-#include "libsigrok.h"
+#include <libsigrok/libsigrok.h>
 #include "libsigrok-internal.h"
 
 #define LOG_PREFIX "input/wav"
@@ -38,9 +39,9 @@
 /* Expect to find the "data" chunk within this offset from the start. */
 #define MAX_DATA_CHUNK_OFFSET    256
 
-#define WAVE_FORMAT_PCM          0x0001
-#define WAVE_FORMAT_IEEE_FLOAT   0x0003
-#define WAVE_FORMAT_EXTENSIBLE   0xfffe
+#define WAVE_FORMAT_PCM_         0x0001
+#define WAVE_FORMAT_IEEE_FLOAT_  0x0003
+#define WAVE_FORMAT_EXTENSIBLE_  0xfffe
 
 struct context {
        gboolean started;
@@ -73,14 +74,13 @@ static int parse_wav_header(GString *buf, struct context *inc)
                return SR_ERR_DATA;
        }
 
-
-       if (fmt_code == WAVE_FORMAT_PCM) {
-       } else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT) {
+       if (fmt_code == WAVE_FORMAT_PCM_) {
+       } else if (fmt_code == WAVE_FORMAT_IEEE_FLOAT_) {
                if (unitsize != 4) {
                        sr_err("only 32-bit floats supported.");
                        return SR_ERR_DATA;
                }
-       } else if (fmt_code == WAVE_FORMAT_EXTENSIBLE) {
+       } else if (fmt_code == WAVE_FORMAT_EXTENSIBLE_) {
                if (buf->len < 70)
                        /* Not enough for extensible header and next chunk. */
                        return SR_ERR_NA;
@@ -99,11 +99,11 @@ static int parse_wav_header(GString *buf, struct context *inc)
                }
                /* Real format code is the first two bytes of the GUID. */
                fmt_code = RL16(buf->str + 44);
-               if (fmt_code != WAVE_FORMAT_PCM && fmt_code != WAVE_FORMAT_IEEE_FLOAT) {
+               if (fmt_code != WAVE_FORMAT_PCM_ && fmt_code != WAVE_FORMAT_IEEE_FLOAT_) {
                        sr_err("Only PCM and floating point samples are supported.");
                        return SR_ERR_DATA;
                }
-               if (fmt_code == WAVE_FORMAT_IEEE_FLOAT && unitsize != 4) {
+               if (fmt_code == WAVE_FORMAT_IEEE_FLOAT_ && unitsize != 4) {
                        sr_err("only 32-bit floats supported.");
                        return SR_ERR_DATA;
                }
@@ -161,13 +161,12 @@ static int find_data_chunk(GString *buf, int initial_offset)
        unsigned int offset, i;
 
        offset = initial_offset;
-       while(offset < MIN(MAX_DATA_CHUNK_OFFSET, buf->len)) {
+       while (offset < MIN(MAX_DATA_CHUNK_OFFSET, buf->len)) {
                if (!memcmp(buf->str + offset, "data", 4))
                        /* Skip into the samples. */
                        return offset + 8;
                for (i = 0; i < 4; i++) {
-                       if (!isalpha(buf->str[offset + i])
-                                       && !isascii(buf->str[offset + i])
+                       if (!isalnum(buf->str[offset + i])
                                        && !isblank(buf->str[offset + i]))
                                /* Doesn't look like a chunk ID. */
                                return -1;
@@ -182,7 +181,7 @@ static int find_data_chunk(GString *buf, int initial_offset)
 static void send_chunk(const struct sr_input *in, int offset, int num_samples)
 {
        struct sr_datafeed_packet packet;
-       struct sr_datafeed_analog analog;
+       struct sr_datafeed_analog_old analog;
        struct context *inc;
        float fdata[CHUNK_SIZE];
        uint64_t sample;
@@ -196,7 +195,7 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
        memset(fdata, 0, CHUNK_SIZE);
        total_samples = num_samples * inc->num_channels;
        for (samplenum = 0; samplenum < total_samples; samplenum++) {
-               if (inc->fmt_code == WAVE_FORMAT_PCM) {
+               if (inc->fmt_code == WAVE_FORMAT_PCM_) {
                        sample = 0;
                        memcpy(&sample, s, inc->unitsize);
                        switch (inc->samplesize) {
@@ -224,7 +223,7 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
                s += inc->unitsize;
                d += inc->unitsize;
        }
-       packet.type = SR_DF_ANALOG;
+       packet.type = SR_DF_ANALOG_OLD;
        packet.payload = &analog;
        analog.channels = in->sdi->channels;
        analog.num_samples = num_samples;
@@ -259,6 +258,7 @@ static int process_buffer(struct sr_input *in)
                src = sr_config_new(SR_CONF_SAMPLERATE, g_variant_new_uint64(inc->samplerate));
                meta.config = g_slist_append(NULL, src);
                sr_session_send(in->sdi, &packet);
+               g_slist_free(meta.config);
                sr_config_free(src);
 
                inc->started = TRUE;
@@ -370,4 +370,3 @@ SR_PRIV struct sr_input_module input_wav = {
        .receive = receive,
        .end = end,
 };
-