input/trace32_ad: fix potential buffer overflow for unexpected input data

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

diff --git a/src/input/wav.c b/src/input/wav.c
index 35247112b05de8ac45e665a444f5a29e2155de2a..75f1ecce8c2116deee6a3296c58cf9c895cab57e 100644 (file)
--- a/src/input/wav.c
+++ b/src/input/wav.c
@@ -31,7 +31,7 @@
 #define LOG_PREFIX "input/wav"
 
 /* How many bytes at a time to process and send to the session bus. */
-#define CHUNK_SIZE               4096
+#define CHUNK_SIZE               (1 * 1024 * 1024 * sizeof(float))
 
 /* Minimum size of header + 1 8-bit mono PCM sample. */
 #define MIN_DATA_CHUNK_OFFSET    45
@@ -124,7 +124,7 @@ static int parse_wav_header(GString *buf, struct context *inc)
        return SR_OK;
 }
 
-static int format_match(GHashTable *metadata)
+static int format_match(GHashTable *metadata, unsigned int *confidence)
 {
        GString *buf;
        int ret;
@@ -143,6 +143,8 @@ static int format_match(GHashTable *metadata)
        if ((ret = parse_wav_header(buf, NULL)) != SR_OK)
                return ret;
 
+       *confidence = 1;
+
        return SR_OK;
 }
 
@@ -189,15 +191,15 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
        struct sr_analog_meaning meaning;
        struct sr_analog_spec spec;
        struct context *inc;
-       float fdata[CHUNK_SIZE];
+       float *fdata;
        int total_samples, samplenum;
        char *s, *d;
 
        inc = in->priv;
 
        s = in->buf->str + offset;
+       fdata = g_malloc0(CHUNK_SIZE * sizeof(float));
        d = (char *)fdata;
-       memset(fdata, 0, CHUNK_SIZE * sizeof(float));
        total_samples = num_samples * inc->num_channels;
        for (samplenum = 0; samplenum < total_samples; samplenum++) {
                if (inc->fmt_code == WAVE_FORMAT_PCM_) {
@@ -238,6 +240,7 @@ static void send_chunk(const struct sr_input *in, int offset, int num_samples)
        analog.meaning->mqflags = 0;
        analog.meaning->unit = 0;
        sr_session_send(in->sdi, &packet);
+       g_free(fdata);
 }
 
 static int process_buffer(struct sr_input *in)
@@ -331,7 +334,7 @@ static int receive(struct sr_input *in, GString *buf)
                        return ret;
 
                for (int i = 0; i < inc->num_channels; i++) {
-                       snprintf(channelname, 8, "CH%d", i + 1);
+                       snprintf(channelname, sizeof(channelname), "CH%d", i + 1);
                        sr_channel_new(in->sdi, i, SR_CHANNEL_ANALOG, TRUE, channelname);
                }
 
@@ -375,7 +378,7 @@ static int reset(struct sr_input *in)
 SR_PRIV struct sr_input_module input_wav = {
        .id = "wav",
        .name = "WAV",
-       .desc = "WAV file",
+       .desc = "Microsoft WAV file format data",
        .exts = (const char*[]){"wav", NULL},
        .metadata = { SR_INPUT_META_HEADER | SR_INPUT_META_REQUIRED },
        .format_match = format_match,