mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: don't assume char is unsigned. (#9375) 

On systems that have unsigned char by default (s390x, arm), redis-server
could crash as soon as it populates the command table.
This commit is contained in:
Yossi Gottlieb 2021-08-15 21:37:44 +03:00 committed by GitHub
parent 8edc3cd62c
commit fe359cbfc2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dict.c
View File

@ -61,7 +61,7 @@ static unsigned int dict_force_resize_ratio = 5;
/* -------------------------- private prototypes ---------------------------- */
static int _dictExpandIfNeeded(dict *d);
static char _dictNextExp(unsigned long size);
static signed char _dictNextExp(unsigned long size);
static long _dictKeyIndex(dict *d, const void *key, uint64_t hash, dictEntry **existing);
static int _dictInit(dict *d, dictType *type);
@ -150,7 +150,7 @@ int _dictExpand(dict *d, unsigned long size, int* malloc_failed)
/* the new hash table */
dictEntry **new_ht_table;
unsigned long new_ht_used;
char new_ht_size_exp = _dictNextExp(size);
signed char new_ht_size_exp = _dictNextExp(size);
/* Detect overflows */
size_t newsize = 1ul<<new_ht_size_exp;
@ -1009,7 +1009,7 @@ static int _dictExpandIfNeeded(dict *d)
/* TODO: clz optimization */
/* Our hash table capability is a power of two */
static char _dictNextExp(unsigned long size)
static signed char _dictNextExp(unsigned long size)
{
unsigned char e = DICT_HT_INITIAL_EXP;

2
src/dict.h
View File

@ -80,7 +80,7 @@ struct dict {
/* Keep small vars at end for optimal (minimal) struct padding */
int16_t pauserehash; /* If >0 rehashing is paused (<0 indicates coding error) */
char ht_size_exp[2]; /* exponent of size. (size = 1<<exp) */
signed char ht_size_exp[2]; /* exponent of size. (size = 1<<exp) */
};
/* If safe is set to 1 this is a safe iterator, that means, you can call