kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-23 11:36:09 +00:00
Code Issues Projects Releases Wiki Activity

[apr] scan-build: Dereference of null pointer in apr_hash_merge()

Browse Source
This commit is contained in:
Andrey Volk 2021-04-19 23:27:14 +03:00
parent cba582cf4a
commit d6884d6871
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libs/apr/tables/apr_hash.c
View File

@ -28,6 +28,8 @@
#include <string.h> #include <string.h>
#endif #endif
#include <assert.h> /* assert() */
#if APR_POOL_DEBUG && APR_HAVE_STDIO_H #if APR_POOL_DEBUG && APR_HAVE_STDIO_H
#include <stdio.h> #include <stdio.h>
#endif #endif
@ -433,6 +435,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_merge(apr_pool_t *p,
for (k = 0; k <= base->max; k++) { for (k = 0; k <= base->max; k++) {
for (iter = base->array[k]; iter; iter = iter->next) { for (iter = base->array[k]; iter; iter = iter->next) {
i = iter->hash & res->max; i = iter->hash & res->max;
assert(new_vals);
new_vals[j].klen = iter->klen; new_vals[j].klen = iter->klen;
new_vals[j].key = iter->key; new_vals[j].key = iter->key;
new_vals[j].val = iter->val; new_vals[j].val = iter->val;