rsyslog/rsyslog
1
0
Fork 0
mirror of https://github.com/rsyslog/rsyslog.git synced 2025-12-19 03:20:41 +01:00
Code Issues Packages Projects Releases Wiki Activity

lookup tables: fix undefined behaviour

Browse Source 
bsearch is not permitted to be called with NULL ptr for array.

Detectedb by LLVM UBSan.

see also https://github.com/rsyslog/rsyslog/issues/2295
This commit is contained in:
Rainer Gerhards 2017-12-25 16:19:32 +01:00
parent 2d1aa30367
commit 4f13c27d5a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runtime/lookup.c
View File

@ -301,8 +301,13 @@ static es_str_t*
lookupKey_str(lookup_t *pThis, lookup_key_t key) {
lookup_string_tab_entry_t *entry;
const char *r;
entry = bsearch(key.k_str, pThis->table.str->entries, pThis->nmemb, sizeof(lookup_string_tab_entry_t),
bs_arrcmp_strtab);
if(pThis->nmemb == 0) {
entry = NULL;
} else {
assert(pThis->table.str->entries);
entry = bsearch(key.k_str, pThis->table.str->entries, pThis->nmemb,
sizeof(lookup_string_tab_entry_t), bs_arrcmp_strtab);
}
if(entry == NULL) {
r = defaultVal(pThis);
} else {