c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

hash: Fix false positive from -fanalyzer

Browse Source
This commit is contained in:
Nick Wellnhofer 2025-03-14 01:49:22 +01:00
parent b349225952
commit e91061eb9f
2 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dict.c
View File

@ -700,7 +700,7 @@ xmlDictLookupInternal(xmlDictPtr dict, const xmlChar *prefix,
const xmlChar *name, int maybeLen, int update) { const xmlChar *name, int maybeLen, int update) {
xmlDictEntry *entry = NULL; xmlDictEntry *entry = NULL;
const xmlChar *ret; const xmlChar *ret;
unsigned hashValue; unsigned hashValue, newSize;
size_t maxLen, len, plen, klen; size_t maxLen, len, plen, klen;
int found = 0; int found = 0;
@ -727,10 +727,21 @@ xmlDictLookupInternal(xmlDictPtr dict, const xmlChar *prefix,
/* /*
* Check for an existing entry * Check for an existing entry
*/ */
if (dict->size > 0) if (dict->size == 0) {
newSize = MIN_HASH_SIZE;
} else {
entry = xmlDictFindEntry(dict, prefix, name, klen, hashValue, &found); entry = xmlDictFindEntry(dict, prefix, name, klen, hashValue, &found);
if (found) if (found)
return(entry); return(entry);
if (dict->nbElems + 1 > dict->size / MAX_FILL_DENOM * MAX_FILL_NUM) {
if (dict->size >= MAX_HASH_SIZE)
return(NULL);
newSize = dict->size * 2;
} else {
newSize = 0;
}
}
if ((dict->subdict != NULL) && (dict->subdict->size > 0)) { if ((dict->subdict != NULL) && (dict->subdict->size > 0)) {
xmlDictEntry *subEntry; xmlDictEntry *subEntry;
@ -754,16 +765,9 @@ xmlDictLookupInternal(xmlDictPtr dict, const xmlChar *prefix,
/* /*
* Grow the hash table if needed * Grow the hash table if needed
*/ */
if (dict->nbElems + 1 > dict->size / MAX_FILL_DENOM * MAX_FILL_NUM) { if (newSize > 0) {
unsigned newSize, mask, displ, pos; unsigned mask, displ, pos;
if (dict->size == 0) {
newSize = MIN_HASH_SIZE;
} else {
if (dict->size >= MAX_HASH_SIZE)
return(NULL);
newSize = dict->size * 2;
}
if (xmlDictGrow(dict, newSize) != 0) if (xmlDictGrow(dict, newSize) != 0)
return(NULL); return(NULL);

47
hash.c
View File

@ -428,42 +428,49 @@ xmlHashUpdateInternal(xmlHashTablePtr hash, const xmlChar *key,
xmlChar *copy, *copy2, *copy3; xmlChar *copy, *copy2, *copy3;
xmlHashEntry *entry = NULL; xmlHashEntry *entry = NULL;
size_t lengths[3] = {0, 0, 0}; size_t lengths[3] = {0, 0, 0};
unsigned hashValue; unsigned hashValue, newSize;
int found = 0;
if ((hash == NULL) || (key == NULL)) if ((hash == NULL) || (key == NULL))
return(-1); return(-1);
hashValue = xmlHashValue(hash->randomSeed, key, key2, key3, lengths);
/* /*
* Check for an existing entry * Check for an existing entry
*/ */
hashValue = xmlHashValue(hash->randomSeed, key, key2, key3, lengths); if (hash->size == 0) {
if (hash->size > 0) newSize = MIN_HASH_SIZE;
} else {
int found = 0;
entry = xmlHashFindEntry(hash, key, key2, key3, hashValue, &found); entry = xmlHashFindEntry(hash, key, key2, key3, hashValue, &found);
if (found) {
if (update) { if (found) {
if (dealloc) if (update) {
dealloc(entry->payload, entry->key); if (dealloc)
entry->payload = payload; dealloc(entry->payload, entry->key);
entry->payload = payload;
}
return(0);
} }
return(0); if (hash->nbElems + 1 > hash->size / MAX_FILL_DENOM * MAX_FILL_NUM) {
/* This guarantees that nbElems < INT_MAX */
if (hash->size >= MAX_HASH_SIZE)
return(-1);
newSize = hash->size * 2;
} else {
newSize = 0;
}
} }
/* /*
* Grow the hash table if needed * Grow the hash table if needed
*/ */
if (hash->nbElems + 1 > hash->size / MAX_FILL_DENOM * MAX_FILL_NUM) { if (newSize > 0) {
unsigned newSize, mask, displ, pos; unsigned mask, displ, pos;
if (hash->size == 0) {
newSize = MIN_HASH_SIZE;
} else {
/* This guarantees that nbElems < INT_MAX */
if (hash->size >= MAX_HASH_SIZE)
return(-1);
newSize = hash->size * 2;
}
if (xmlHashGrow(hash, newSize) != 0) if (xmlHashGrow(hash, newSize) != 0)
return(-1); return(-1);