ioctl_tree: Avoid node list overflow

scrapfly · Jan 18, 2022 · 96b42a3 · 96b42a3
1 parent 71b0806
commit 96b42a3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/ioctl_tree.c b/src/ioctl_tree.c
@@ -19,6 +19,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include <assert.h>
 #include <errno.h>
 #include <linux/ioctl.h>
@@ -338,8 +339,9 @@ void
 ioctl_node_list_append(ioctl_node_list * list, ioctl_tree * element)
 {
     if (list->n == list->capacity) {
+	assert(list->capacity < SIZE_MAX / 2);
 	list->capacity *= 2;
-	list->items = realloc(list->items, list->capacity * sizeof(ioctl_tree *));
+	list->items = reallocarray(list->items, list->capacity, sizeof(ioctl_tree *));
 	assert(list->items != NULL);
     }
 

diff --git a/src/ioctl_tree.h b/src/ioctl_tree.h
@@ -46,7 +46,7 @@ typedef struct {
 
 typedef struct {
     ssize_t n;
-    ssize_t capacity;
+    size_t capacity;
     ioctl_tree **items;
 } ioctl_node_list;