From 77b06af7a12f046acf46f2cfd592fd0070485d98 Mon Sep 17 00:00:00 2001 From: Simon Morlat Date: Thu, 5 Sep 2013 17:19:24 +0200 Subject: [PATCH] fix crash and update ms2 --- coreapi/bellesip_sal/sal_impl.c | 7 ++++++- mediastreamer2 | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/coreapi/bellesip_sal/sal_impl.c b/coreapi/bellesip_sal/sal_impl.c index f6f99cd93..c86064e24 100644 --- a/coreapi/bellesip_sal/sal_impl.c +++ b/coreapi/bellesip_sal/sal_impl.c @@ -114,12 +114,17 @@ void sal_process_authentication(SalOp *op) { sal_add_pending_auth(op->base.root,op); if (op->dialog && belle_sip_dialog_get_state(op->dialog)==BELLE_SIP_DIALOG_CONFIRMED) { - request = belle_sip_dialog_create_request_from(op->dialog,(const belle_sip_request_t *)request); + request = belle_sip_dialog_create_queued_request_from(op->dialog,(const belle_sip_request_t *)request); is_within_dialog=TRUE; } else { belle_sip_message_remove_header(BELLE_SIP_MESSAGE(request),BELLE_SIP_AUTHORIZATION); belle_sip_message_remove_header(BELLE_SIP_MESSAGE(request),BELLE_SIP_PROXY_AUTHORIZATION); } + if (request==NULL) { + ms_error("sal_process_authentication() op=[%p] cannot obtain new request from dialog.",op); + return; + } + if (belle_sip_provider_add_authorization(op->base.root->prov,request,response,&auth_list)) { if (is_within_dialog) { sal_op_send_request(op,request); diff --git a/mediastreamer2 b/mediastreamer2 index 174725a01..c516f225b 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 174725a01af56ff402abaf1041e0731f2aa97ecc +Subproject commit c516f225bea6ac2132f3468235138e2dde6cfcda