* [lingpiod][PATCH] bindings: python: fix uninitialized default_vals being passed to gpiod_LineBulk_request()
@ 2021-02-15 12:48 Kent Gibson
2021-02-15 15:48 ` Bartosz Golaszewski
0 siblings, 1 reply; 2+ messages in thread
From: Kent Gibson @ 2021-02-15 12:48 UTC (permalink / raw)
To: linux-gpio, bgolaszewski; +Cc: Kent Gibson, Pedro Botella
If "default_vals" is not provided in the kwds then default_vals are
passed uninitialized to gpiod_line_request_bulk(), so rename the
existing default_vals to vals and introduce a new default_vals that
points to vals, or NULL if no defaults have been passed.
Fixes: 96c524c4951c (bindings: implement python bindings)
Reported-by: Pedro Botella <pbotella@gmail.com>
Signed-off-by: Kent Gibson <warthog618@gmail.com>
---
bindings/python/gpiodmodule.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/bindings/python/gpiodmodule.c b/bindings/python/gpiodmodule.c
index fee4c32..832787d 100644
--- a/bindings/python/gpiodmodule.c
+++ b/bindings/python/gpiodmodule.c
@@ -1327,12 +1327,13 @@ static PyObject *gpiod_LineBulk_request(gpiod_LineBulkObject *self,
NULL };
int rv, type = gpiod_LINE_REQ_DIR_AS_IS, flags = 0,
- default_vals[GPIOD_LINE_BULK_MAX_LINES], val;
+ vals[GPIOD_LINE_BULK_MAX_LINES], val;
PyObject *def_vals_obj = NULL, *iter, *next;
struct gpiod_line_request_config conf;
struct gpiod_line_bulk bulk;
Py_ssize_t num_def_vals;
char *consumer = NULL;
+ const int *default_vals = NULL;
Py_ssize_t i;
if (gpiod_LineBulkOwnerIsClosed(self))
@@ -1348,7 +1349,7 @@ static PyObject *gpiod_LineBulk_request(gpiod_LineBulkObject *self,
gpiod_MakeRequestConfig(&conf, consumer, type, flags);
if (def_vals_obj) {
- memset(default_vals, 0, sizeof(default_vals));
+ memset(vals, 0, sizeof(vals));
num_def_vals = PyObject_Size(def_vals_obj);
if (num_def_vals != self->num_lines) {
@@ -1375,8 +1376,9 @@ static PyObject *gpiod_LineBulk_request(gpiod_LineBulkObject *self,
return NULL;
}
- default_vals[i] = !!val;
+ vals[i] = !!val;
}
+ default_vals = vals;
}
Py_BEGIN_ALLOW_THREADS;
--
2.30.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [lingpiod][PATCH] bindings: python: fix uninitialized default_vals being passed to gpiod_LineBulk_request()
2021-02-15 12:48 [lingpiod][PATCH] bindings: python: fix uninitialized default_vals being passed to gpiod_LineBulk_request() Kent Gibson
@ 2021-02-15 15:48 ` Bartosz Golaszewski
0 siblings, 0 replies; 2+ messages in thread
From: Bartosz Golaszewski @ 2021-02-15 15:48 UTC (permalink / raw)
To: Kent Gibson; +Cc: open list:GPIO SUBSYSTEM, Bartosz Golaszewski, Pedro Botella
On Mon, Feb 15, 2021 at 1:51 PM Kent Gibson <warthog618@gmail.com> wrote:
>
> If "default_vals" is not provided in the kwds then default_vals are
> passed uninitialized to gpiod_line_request_bulk(), so rename the
> existing default_vals to vals and introduce a new default_vals that
> points to vals, or NULL if no defaults have been passed.
>
> Fixes: 96c524c4951c (bindings: implement python bindings)
> Reported-by: Pedro Botella <pbotella@gmail.com>
> Signed-off-by: Kent Gibson <warthog618@gmail.com>
> ---
> bindings/python/gpiodmodule.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/bindings/python/gpiodmodule.c b/bindings/python/gpiodmodule.c
> index fee4c32..832787d 100644
> --- a/bindings/python/gpiodmodule.c
> +++ b/bindings/python/gpiodmodule.c
> @@ -1327,12 +1327,13 @@ static PyObject *gpiod_LineBulk_request(gpiod_LineBulkObject *self,
> NULL };
>
> int rv, type = gpiod_LINE_REQ_DIR_AS_IS, flags = 0,
> - default_vals[GPIOD_LINE_BULK_MAX_LINES], val;
> + vals[GPIOD_LINE_BULK_MAX_LINES], val;
> PyObject *def_vals_obj = NULL, *iter, *next;
> struct gpiod_line_request_config conf;
> struct gpiod_line_bulk bulk;
> Py_ssize_t num_def_vals;
> char *consumer = NULL;
> + const int *default_vals = NULL;
> Py_ssize_t i;
>
> if (gpiod_LineBulkOwnerIsClosed(self))
> @@ -1348,7 +1349,7 @@ static PyObject *gpiod_LineBulk_request(gpiod_LineBulkObject *self,
> gpiod_MakeRequestConfig(&conf, consumer, type, flags);
>
> if (def_vals_obj) {
> - memset(default_vals, 0, sizeof(default_vals));
> + memset(vals, 0, sizeof(vals));
>
> num_def_vals = PyObject_Size(def_vals_obj);
> if (num_def_vals != self->num_lines) {
> @@ -1375,8 +1376,9 @@ static PyObject *gpiod_LineBulk_request(gpiod_LineBulkObject *self,
> return NULL;
> }
>
> - default_vals[i] = !!val;
> + vals[i] = !!val;
> }
> + default_vals = vals;
> }
>
> Py_BEGIN_ALLOW_THREADS;
> --
> 2.30.0
>
Applied, thanks!
Bartosz
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-02-15 16:05 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-15 12:48 [lingpiod][PATCH] bindings: python: fix uninitialized default_vals being passed to gpiod_LineBulk_request() Kent Gibson
2021-02-15 15:48 ` Bartosz Golaszewski
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.