zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hashtable: fail hard on too big size request

This commit is contained in:
Christian Göttsche 2021-01-04 23:33:06 +01:00 committed by cgzones
parent ca2c01bd16
commit 8e10cde800
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Hashtable.c
View File

@ -15,6 +15,7 @@ in the source distribution for its full text.
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "CRT.h"
#include "Macros.h" #include "Macros.h"
#include "XUtils.h" #include "XUtils.h"
@ -95,14 +96,13 @@ static const uint64_t OEISprimes[] = {
}; };
static uint64_t nextPrime(size_t n) { static uint64_t nextPrime(size_t n) {
assert(n <= OEISprimes[ARRAYSIZE(OEISprimes) - 1]); /* on 32-bit make sure we do not return primes not fitting in size_t */
for (size_t i = 0; i < ARRAYSIZE(OEISprimes) && OEISprimes[i] < SIZE_MAX; i++) {
for (size_t i = 0; i < ARRAYSIZE(OEISprimes); i++) {
if (n <= OEISprimes[i]) if (n <= OEISprimes[i])
return OEISprimes[i]; return OEISprimes[i];
} }
return OEISprimes[ARRAYSIZE(OEISprimes) - 1]; CRT_fatalError("Hashtable: no prime found");
} }
Hashtable* Hashtable_new(size_t size, bool owner) { Hashtable* Hashtable_new(size_t size, bool owner) {
@ -215,8 +215,12 @@ void Hashtable_put(Hashtable* this, ht_key_t key, void* value) {
assert(value); assert(value);
/* grow on load-factor > 0.7 */ /* grow on load-factor > 0.7 */
if (10 * this->items > 7 * this->size) if (10 * this->items > 7 * this->size) {
if (SIZE_MAX / 2 < this->size)
CRT_fatalError("Hashtable: size overflow");
Hashtable_setSize(this, 2 * this->size); Hashtable_setSize(this, 2 * this->size);
}
insert(this, key, value); insert(this, key, value);