diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-08-12 03:03:51 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-08-12 03:03:51 -0500 |
| commit | 0383500afb0bfc2e34cefac17cec25853fc7d0f5 (patch) | |
| tree | 1fcf8b2cc6873e783eee1b70932a91ea8a40d4d8 /res/res_pjsip | |
| parent | ee150b697faf781a059061d8d73d8348f8187170 (diff) | |
| parent | 6e40334d89104f0208df6d57fe26c299e392f89e (diff) | |
Merge "pjsip_distributor.c: Add missing allocation failure check." into 13
Diffstat (limited to 'res/res_pjsip')
| -rw-r--r-- | res/res_pjsip/pjsip_distributor.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/res/res_pjsip/pjsip_distributor.c b/res/res_pjsip/pjsip_distributor.c index e8ed89361..8a9119639 100644 --- a/res/res_pjsip/pjsip_distributor.c +++ b/res/res_pjsip/pjsip_distributor.c @@ -965,7 +965,7 @@ static int clean_task(const void *data) static void global_loaded(const char *object_type) { 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; ast_free(identifier_order); @@ -982,6 +982,7 @@ static void global_loaded(const char *object_type) /* Clean out the old task, if any */ 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) { return; } |