gpiod 2.4.2__tar.gz → 2.4.3__tar.gz

{gpiod-2.4.2/gpiod.egg-info → gpiod-2.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gpiod
-Version: 2.4.2
+Version: 2.4.3
 Summary: Python bindings for libgpiod
 Author-email: Bartosz Golaszewski <brgl@bgdev.pl>
 License-Expression: LGPL-2.1-or-later

{gpiod-2.4.2 → gpiod-2.4.3}/gpiod/ext/chip.c

@@ -79,7 +79,9 @@ static PyObject *chip_get_info(chip_object *self, PyObject *Py_UNUSED(ignored))
 	if (!type)
 		return NULL;
 
+	Py_BEGIN_ALLOW_THREADS;
 	info = gpiod_chip_get_info(self->chip);
+	Py_END_ALLOW_THREADS;
 	if (!info) {
 		Py_DECREF(type);
 		return PyErr_SetFromErrno(PyExc_OSError);

{gpiod-2.4.2 → gpiod-2.4.3}/gpiod/ext/line-config.c

@@ -119,6 +119,10 @@ line_config_set_output_values(line_config_object *self, PyObject *args)
 		next = PyIter_Next(iter);
 		if (!next) {
 			Py_DECREF(iter);
+			if (PyErr_Occurred()) {
+				PyMem_Free(valbuf);
+				return NULL;
+			}
 			break;
 		}
 

{gpiod-2.4.2 → gpiod-2.4.3}/gpiod/ext/request.c

@@ -82,7 +82,6 @@ static PyObject *request_offsets(request_object *self, void *Py_UNUSED(ignored))
 
 		ret = PyList_SetItem(lines, i, line);
 		if (ret) {
-			Py_DECREF(line);
 			Py_DECREF(lines);
 			PyMem_Free(offsets);
 			return NULL;
@@ -165,6 +164,8 @@ static PyObject *request_get_values(request_object *self, PyObject *args)
 		next = PyIter_Next(iter);
 		if (!next) {
 			Py_DECREF(iter);
+			if (PyErr_Occurred())
+				return NULL;
 			break;
 		}
 
@@ -198,7 +199,6 @@ static PyObject *request_get_values(request_object *self, PyObject *args)
 
 		ret = PyList_SetItem(values, pos, val);
 		if (ret) {
-			Py_DECREF(val);
 			Py_DECREF(type);
 			return NULL;
 		}
@@ -339,7 +339,6 @@ static PyObject *request_read_edge_events(request_object *self, PyObject *args)
 
 		ret = PyList_SetItem(events, i, event_obj);
 		if (ret) {
-			Py_DECREF(event_obj);
 			Py_DECREF(events);
 			Py_DECREF(type);
 			return NULL;

{gpiod-2.4.2 → gpiod-2.4.3}/gpiod/version.py

@@ -2,4 +2,4 @@
 # SPDX-FileCopyrightText: 2022 Linaro Ltd.
 # SPDX-FileCopyrightText: 2022 Bartosz Golaszewski <bartosz.golaszewski@linaro.org>
 
-__version__ = "2.4.2"
+__version__ = "2.4.3"

{gpiod-2.4.2 → gpiod-2.4.3/gpiod.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gpiod
-Version: 2.4.2
+Version: 2.4.3
 Summary: Python bindings for libgpiod
 Author-email: Bartosz Golaszewski <brgl@bgdev.pl>
 License-Expression: LGPL-2.1-or-later

{gpiod-2.4.2 → gpiod-2.4.3}/lib/chip-info.c

@@ -58,6 +58,7 @@ gpiod_chip_info_from_uapi(struct gpiochip_info *uapi_info)
 	 * the worst case (would have to be a weird kernel bug) it'll be empty.
 	 */
 	strncpy(info->name, uapi_info->name, GPIO_MAX_NAME_SIZE);
+	info->name[GPIO_MAX_NAME_SIZE] = '\0';
 
 	/*
 	 * The kernel sets the label of a GPIO device to "unknown" if it
@@ -68,6 +69,7 @@ gpiod_chip_info_from_uapi(struct gpiochip_info *uapi_info)
 		strncpy(info->label, "unknown", GPIO_MAX_NAME_SIZE);
 	else
 		strncpy(info->label, uapi_info->label, GPIO_MAX_NAME_SIZE);
+	info->label[GPIO_MAX_NAME_SIZE] = '\0';
 
 	return info;
 }

{gpiod-2.4.2 → gpiod-2.4.3}/lib/edge-event.c

@@ -184,6 +184,11 @@ int gpiod_edge_event_buffer_read_fd(int fd,
 	if (max_events > buffer->capacity)
 		max_events = buffer->capacity;
 
+	if (max_events == 0) {
+		buffer->num_events = 0;
+		return 0;
+	}
+
 	rd = read(fd, buffer->event_data,
 		  max_events * sizeof(*buffer->event_data));
 	if (rd < 0) {

{gpiod-2.4.2 → gpiod-2.4.3}/lib/line-config.c

@@ -90,13 +90,50 @@ static struct per_line_config *find_config(struct gpiod_line_config *config,
 	return &config->line_configs[config->num_configs++];
 }
 
+/*
+ * Count offsets in the input array that would require a new slot in the
+ * config: those not already present in config->line_configs and not repeated
+ * earlier in the same offsets array.
+ */
+static size_t count_new_offsets(const struct gpiod_line_config *config,
+				const unsigned int *offsets, size_t num_offsets)
+{
+	size_t i, j, num_new = 0;
+	bool existing;
+
+	for (i = 0; i < num_offsets; i++) {
+		existing = false;
+
+		for (j = 0; j < config->num_configs; j++) {
+			if (config->line_configs[j].offset == offsets[i]) {
+				existing = true;
+				break;
+			}
+		}
+
+		if (!existing) {
+			for (j = 0; j < i; j++) {
+				if (offsets[j] == offsets[i]) {
+					existing = true;
+					break;
+				}
+			}
+		}
+
+		if (!existing)
+			num_new++;
+	}
+
+	return num_new;
+}
+
 GPIOD_API int gpiod_line_config_add_line_settings(
 	struct gpiod_line_config *config, const unsigned int *offsets,
 	size_t num_offsets, struct gpiod_line_settings *settings)
 {
 	struct per_line_config *per_line;
 	struct settings_node *node, *old;
-	size_t i;
+	size_t i, new_offsets;
 
 	assert(config);
 
@@ -105,7 +142,9 @@ GPIOD_API int gpiod_line_config_add_line_settings(
 		return -1;
 	}
 
-	if ((config->num_configs + num_offsets) > LINES_MAX) {
+	new_offsets = count_new_offsets(config, offsets, num_offsets);
+
+	if ((config->num_configs + new_offsets) > LINES_MAX) {
 		errno = E2BIG;
 		return -1;
 	}
@@ -143,7 +182,7 @@ GPIOD_API int gpiod_line_config_add_line_settings(
 				old->prev->next = old->next;
 			if (old->next)
 				old->next->prev = old->prev;
-			free(old->settings);
+			gpiod_line_settings_free(old->settings);
 			free(old);
 		}
 	}

{gpiod-2.4.2 → gpiod-2.4.3}/lib/line-info.c

@@ -149,9 +149,11 @@ gpiod_line_info_from_uapi(struct gpio_v2_line_info *uapi_info)
 
 	info->offset = uapi_info->offset;
 	strncpy(info->name, uapi_info->name, GPIO_MAX_NAME_SIZE);
+	info->name[GPIO_MAX_NAME_SIZE] = '\0';
 
 	info->used = !!(uapi_info->flags & GPIO_V2_LINE_FLAG_USED);
 	strncpy(info->consumer, uapi_info->consumer, GPIO_MAX_NAME_SIZE);
+	info->consumer[GPIO_MAX_NAME_SIZE] = '\0';
 
 	if (uapi_info->flags & GPIO_V2_LINE_FLAG_OUTPUT)
 		info->direction = GPIOD_LINE_DIRECTION_OUTPUT;

{gpiod-2.4.2 → gpiod-2.4.3}/lib/line-request.c

@@ -99,7 +99,7 @@ gpiod_line_request_get_value(struct gpiod_line_request *request,
 			     unsigned int offset)
 {
 	enum gpiod_line_value val;
-	unsigned int ret;
+	int ret;
 
 	assert(request);
 

gpiod-2.4.3/libgpiod-version.txt

@@ -0,0 +1 @@
+2.2.5

gpiod-2.4.2/libgpiod-version.txt

@@ -1 +0,0 @@
-2.2.4