From 4dc93bc274867b42aa82fc91ee4d5878d23a3f36 Mon Sep 17 00:00:00 2001
From: Nikias Bassen
Date: Thu, 5 Nov 2026 12:01:59 +0100
Subject: Harden allocation failure handling and size arithmetic

- check malloc/calloc/realloc results in constructors, the JSON and
  OpenStep writers, the XML text-part helpers and base64 decoding, and
  return PLIST_ERR_NO_MEM instead of asserting or dereferencing NULL
- guard size calculations against overflow in the UTF-8/UTF-16BE
  conversions, ptrarray, and bytearray
- make hash_table_insert() report failure instead of silently dropping
  the entry; writers propagate PLIST_ERR_NO_MEM, and dict lookup caches
  are discarded so lookups fall back to a linear search
- don't overwrite an earlier parse error code in the XML parser, and
  report PLIST_ERR_NO_MEM when reading text content fails for lack of memory
- OpenStep parser: check node/data/string allocations and dict/array
  insertion results

Based on #323 by bg0d-droid.

Co-authored-by: bg0d-droid <81825610+bg0d-droid@users.noreply.github.com>
---
 src/hashtable.c | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'src/hashtable.c')

diff --git a/src/hashtable.c b/src/hashtable.c
index dd6dbfc..e3f9b98 100644
--- a/src/hashtable.c
+++ b/src/hashtable.c
@@ -24,6 +24,9 @@ hashtable_t* hash_table_new(hash_func_t hash_func, compare_func_t compare_func,
 {
 	hashtable_t* ht = (hashtable_t*)malloc(sizeof(hashtable_t));
 	int i;
+	if (!ht) {
+		return NULL;
+	}
 	for (i = 0; i < 4096; i++) {
 		ht->entries[i] = NULL;
 	}
@@ -55,9 +58,9 @@ void hash_table_destroy(hashtable_t *ht)
 	free(ht);
 }
 
-void hash_table_insert(hashtable_t* ht, void *key, void *value)
+int hash_table_insert(hashtable_t* ht, void *key, void *value)
 {
-	if (!ht || !key) return;
+	if (!ht || !key) return -1;
 
 	unsigned int hash = ht->hash_func(key);
 
@@ -69,7 +72,7 @@ void hash_table_insert(hashtable_t* ht, void *key, void *value)
 		if (ht->compare_func(e->key, key)) {
 			// element already present. replace value.
 			e->value = value;
-			return;
+			return 0;
 		}
 		e = e->next;
 	}
@@ -78,6 +81,9 @@ void hash_table_insert(hashtable_t* ht, void *key, void *value)
 
 	// make a new entry.
 	hashentry_t* entry = (hashentry_t*)malloc(sizeof(hashentry_t));
+	if (!entry) {
+		return -1;
+	}
 	entry->key = key;
 	entry->value = value;
 	if (!ht->entries[idx0]) {
@@ -89,6 +95,7 @@ void hash_table_insert(hashtable_t* ht, void *key, void *value)
 	}
 	ht->entries[idx0] = entry;
 	ht->count++;
+	return 0;
 }
 
 void* hash_table_lookup(hashtable_t* ht, void *key)
-- 
cgit v1.1-32-gdbae