kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-03 19:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "pjsip_distributor.c: Add missing allocation failure check." into 13

Browse Source
This commit is contained in:
zuul
2016-08-12 03:03:51 -05:00
committed by Gerrit Code Review
parent ee150b697f 6e40334d89
commit 0383500afb
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/res_pjsip/pjsip_distributor.c
View File

@@ -965,7 +965,7 @@ static int clean_task(const void *data)
static void global_loaded(const char *object_type) static void global_loaded(const char *object_type)
{ {
char *identifier_order = ast_sip_get_endpoint_identifier_order(); char *identifier_order = ast_sip_get_endpoint_identifier_order();
char *io_copy = ast_strdupa(identifier_order); char *io_copy = identifier_order ? ast_strdupa(identifier_order) : NULL;
char *identify_method; char *identify_method;
ast_free(identifier_order); ast_free(identifier_order);
@@ -982,6 +982,7 @@ static void global_loaded(const char *object_type)
/* Clean out the old task, if any */ /* Clean out the old task, if any */
ast_sched_clean_by_callback(prune_context, prune_task, clean_task); ast_sched_clean_by_callback(prune_context, prune_task, clean_task);
/* Have to do something with the return value to shut up the stupid compiler. */
if (ast_sched_add_variable(prune_context, unidentified_prune_interval * 1000, prune_task, NULL, 1) < 0) { if (ast_sched_add_variable(prune_context, unidentified_prune_interval * 1000, prune_task, NULL, 1) < 0) {
return; return;
} }