ben.carrasco/freeswitch
1
0 Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2026-11-15 13:58:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

[apr] scan-build: fix dereference of null pointer in apr_hash_merge() and apr_proc_other_child_unregister()

Browse Source
This commit is contained in:
Andrey Volk committed 2020-02-20 23:20:53 +04:00
1 parent d3c4cf3d62
commit e39eb28629
2 files changed
+2 -2
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

libs/apr/misc/unix/otherchild.c
+1 -1
View File
@@ -96,7 +96,7 @@ APR_DECLARE(void) apr_proc_other_child_unregister(void *data)
} }
/* segfault if this function called with invalid parm */ /* segfault if this function called with invalid parm */
apr_pool_cleanup_kill(cur->p, cur->data, other_child_cleanup); if (cur) apr_pool_cleanup_kill(cur->p, cur->data, other_child_cleanup);
other_child_cleanup(data); other_child_cleanup(data);
} }
libs/apr/tables/apr_hash.c
+1 -1
View File
@@ -459,7 +459,7 @@ APR_DECLARE(apr_hash_t *) apr_hash_merge(apr_pool_t *p,
break; break;
} }
} }
if (!ent) { if (new_vals && !ent) {
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;