alsaseq: fix 'ext' buffer fill

The `GETDICTEXT` macro used to perfom one pass on the provided int
list to check the actual item types brefore allocating and filling
the target buffer. The python list was not read again causing the
buffer to be filled with the last value read during the type check.

This patch performs the type check as well as buffer fill in one go.
The buffer is freed if an item is found to be of a wrong type.

Fixes: https://github.com/alsa-project/alsa-python/pull/3
Signed-off-by: François Laignel <fengalin@free.fr>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/pyalsa/alsaseq.c b/pyalsa/alsaseq.c
index e3b76a23471d9bfa12adf959a93e981adcfd6ffb..b2959fbf0e0606f44382016b693629ac5ad36a12 100644 (file)
--- a/pyalsa/alsaseq.c
+++ b/pyalsa/alsaseq.c
@@ -251,6 +251,13 @@
       int len = PyList_Size(list);                                     \
       self->event->data.ext.len = len;                                 \
       if (len > 0) {                                                   \
+       self->buff = malloc(len);                                       \
+       if (self->buff == NULL) {                                       \
+         PyErr_SetString(PyExc_TypeError,                              \
+                       name " no memory");                             \
+         self->event->data.ext.len = 0;                                \
+         return NULL;                                                  \
+       }                                                               \
        int i;                                                          \
        long val;                                                       \
        for (i = 0; i < len; i++) {                                     \
@@ -259,18 +266,12 @@
            PyErr_SetString(PyExc_TypeError,                            \
                            name " must be a list of integers");        \
            self->event->data.ext.len = 0;                              \
-            return NULL;                                               \
+           free(self->buff);                                           \
+           self->buff = NULL;                                          \
+           return NULL;                                                \
          }                                                             \
-       }                                                               \
-       self->buff = malloc(len);                                       \
-       if (self->buff == NULL) {                                       \
-         PyErr_SetString(PyExc_TypeError,                              \
-                       name " no memory");                             \
-         self->event->data.ext.len = 0;                                \
-         return NULL;                                                  \
-       }                                                               \
-       for (i = 0; i < len; i++)                                       \
          self->buff[i] = val;                                          \
+       }                                                               \
        self->event->data.ext.ptr = self->buff;                         \
       }                                                                        \
     }                                                                  \