diff options
| author | Jenkins2 <jenkins2@gerrit.asterisk.org> | 2017-11-13 07:11:57 -0600 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-11-13 07:11:57 -0600 |
| commit | 939b4845539fc21fa02c3f17ff48d6a43bf7b180 (patch) | |
| tree | 807a14c960e2a7fa60a0f3c40a5436739d5f7a13 /res/res_pjsip_pubsub.c | |
| parent | b865d29f1ccfd23c1d975d9149777b0816d83b9e (diff) | |
| parent | 36fedea8c1cb02dda1393c59e7b0e4892f201d72 (diff) | |
Merge "res_pjsip_pubsub: Ensure remote URI contains URI only."
Diffstat (limited to 'res/res_pjsip_pubsub.c')
| -rw-r--r-- | res/res_pjsip_pubsub.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/res/res_pjsip_pubsub.c b/res/res_pjsip_pubsub.c index 42b1a659b..59418e4a9 100644 --- a/res/res_pjsip_pubsub.c +++ b/res/res_pjsip_pubsub.c @@ -2453,9 +2453,14 @@ void ast_sip_subscription_get_local_uri(struct ast_sip_subscription *sub, char * void ast_sip_subscription_get_remote_uri(struct ast_sip_subscription *sub, char *buf, size_t size) { pjsip_dialog *dlg; + pjsip_sip_uri *uri; dlg = sub->tree->dlg; - ast_copy_pj_str(buf, &dlg->remote.info_str, size); + uri = pjsip_uri_get_uri(dlg->remote.info->uri); + + if (pjsip_uri_print(PJSIP_URI_IN_FROMTO_HDR, uri, buf, size) < 0) { + *buf = '\0'; + } } const char *ast_sip_subscription_get_resource_name(struct ast_sip_subscription *sub) |