gpiod 2.4.1__tar.gz → 2.4.2__tar.gz

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

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

{gpiod-2.4.1 → gpiod-2.4.2}/gpiod/ext/line-settings.c

@@ -70,10 +70,6 @@ line_settings_init(line_settings_object *self, PyObject *args, PyObject *kwargs)
 	gpiod_line_settings_set_debounce_period_us(self->settings,
 						   debounce_period);
 
-	ret = gpiod_line_settings_set_edge_detection(self->settings, edge);
-	if (ret)
-		return set_error();
-
 	ret = gpiod_line_settings_set_output_value(self->settings,
 						   output_value);
 	if (ret)

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

@@ -149,6 +149,12 @@ static PyObject *request_get_values(request_object *self, PyObject *args)
 	if (num_offsets < 0)
 		return NULL;
 
+	if (num_offsets > (Py_ssize_t)self->num_lines) {
+		PyErr_SetString(PyExc_ValueError,
+				"number of offsets exceeds the number of requested lines");
+		return NULL;
+	}
+
 	iter = PyObject_GetIter(offsets);
 	if (!iter)
 		return NULL;
@@ -212,6 +218,12 @@ static PyObject *request_set_values(request_object *self, PyObject *args)
 	if (!ret)
 		return NULL;
 
+	if (PyObject_Size(values) > (Py_ssize_t)self->num_lines) {
+		PyErr_SetString(PyExc_ValueError,
+				"number of offsets exceeds the number of requested lines");
+		return NULL;
+	}
+
 	clear_buffers(self);
 
 	/* Note: pos may not be contiguous. */

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

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

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

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

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

@@ -57,7 +57,7 @@ gpiod_chip_info_from_uapi(struct gpiochip_info *uapi_info)
 	 * GPIO device must have a name - don't bother checking this field. In
 	 * the worst case (would have to be a weird kernel bug) it'll be empty.
 	 */
-	strncpy(info->name, uapi_info->name, sizeof(info->name));
+	strncpy(info->name, uapi_info->name, GPIO_MAX_NAME_SIZE);
 
 	/*
 	 * The kernel sets the label of a GPIO device to "unknown" if it
@@ -65,9 +65,9 @@ gpiod_chip_info_from_uapi(struct gpiochip_info *uapi_info)
 	 * we got an empty string, do the same.
 	 */
 	if (uapi_info->label[0] == '\0')
-		strncpy(info->label, "unknown", sizeof(info->label));
+		strncpy(info->label, "unknown", GPIO_MAX_NAME_SIZE);
 	else
-		strncpy(info->label, uapi_info->label, sizeof(info->label));
+		strncpy(info->label, uapi_info->label, GPIO_MAX_NAME_SIZE);
 
 	return info;
 }

{gpiod-2.4.1 → gpiod-2.4.2}/lib/internal.c

@@ -139,7 +139,7 @@ void gpiod_line_mask_zero(uint64_t *mask)
 	*mask = 0ULL;
 }
 
-bool gpiod_line_mask_test_bit(const uint64_t *mask, int nr)
+bool gpiod_line_mask_test_bit(const uint64_t *mask, unsigned int nr)
 {
 	return *mask & (1ULL << nr);
 }

{gpiod-2.4.1 → gpiod-2.4.2}/lib/internal.h

@@ -41,7 +41,7 @@ int gpiod_set_output_value(enum gpiod_line_value in,
 int gpiod_ioctl(int fd, unsigned long request, void *arg);
 
 void gpiod_line_mask_zero(uint64_t *mask);
-bool gpiod_line_mask_test_bit(const uint64_t *mask, int nr);
+bool gpiod_line_mask_test_bit(const uint64_t *mask, unsigned int nr);
 void gpiod_line_mask_set_bit(uint64_t *mask, unsigned int nr);
 void gpiod_line_mask_assign_bit(uint64_t *mask, unsigned int nr, bool value);
 

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

@@ -24,6 +24,11 @@ gpiod_line_request_from_uapi(struct gpio_v2_line_request *uapi_req,
 {
 	struct gpiod_line_request *request;
 
+	if (uapi_req->num_lines > GPIO_V2_LINES_MAX) {
+		errno = EINVAL;
+		return NULL;
+	}
+
 	request = malloc(sizeof(*request));
 	if (!request)
 		return NULL;

{gpiod-2.4.1 → gpiod-2.4.2}/lib/line-settings.c

@@ -16,7 +16,7 @@ struct gpiod_line_settings {
 	enum gpiod_line_bias bias;
 	bool active_low;
 	enum gpiod_line_clock event_clock;
-	long debounce_period_us;
+	unsigned long debounce_period_us;
 	enum gpiod_line_value output_value;
 };
 

gpiod-2.4.2/libgpiod-version.txt

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

{gpiod-2.4.1 → gpiod-2.4.2}/tests/tests_line_request.py

@@ -676,6 +676,28 @@ class LineRequestSurvivesParentChip(TestCase):
         req.release()
 
 
+class UsingMoreLinesThanRequestedNotAllowed(TestCase):
+    def setUp(self) -> None:
+        self.sim = gpiosim.Chip(num_lines=4)
+
+    def tearDown(self) -> None:
+        del self.sim
+
+    def test_line_get_more_values_than_requested_lines(self) -> None:
+        with gpiod.request_lines(
+            self.sim.dev_path, config={0: gpiod.LineSettings(direction=Direction.INPUT)}
+        ) as req:
+            with self.assertRaises(ValueError):
+                req.get_values(list(range(64)))
+
+    def test_line_set_more_values_than_requested_lines(self) -> None:
+        with gpiod.request_lines(
+            self.sim.dev_path, config={0: gpiod.LineSettings(direction=Direction.OUTPUT)}
+        ) as req:
+            with self.assertRaises(ValueError):
+                req.set_values({i: Value.ACTIVE for i in range(64)})
+
+
 class LineRequestStringRepresentation(TestCase):
     def setUp(self) -> None:
         self.sim = gpiosim.Chip(num_lines=8)

gpiod-2.4.1/libgpiod-version.txt

@@ -1 +0,0 @@
-2.2.3