chan_websocket: Fix NULL requestor dereference in webchan_request.

Two log statements in webchan_request() passed `requestor` straight to
ast_channel_name(), which dereferences the channel with no NULL check.
`requestor` is NULL whenever no originator channel is supplied: ARI POST
/channels/externalMedia always passes NULL, and POST /channels/create
passes NULL when `originator` is omitted.

diff --git a/channels/chan_websocket.c b/channels/chan_websocket.c
index 3d2bb80ca44c0bd5ae720854614af94482056255..3d6292288c1e6aac3088f1c7b35a6fb09af8dfc7 100644 (file)
--- a/channels/chan_websocket.c
+++ b/channels/chan_websocket.c
@@ -1695,7 +1695,7 @@ static struct ast_channel *webchan_request(const char *type,
                if (instance->control_msg_format == WEBCHAN_CONTROL_MSG_FORMAT_INVALID) {
                        ast_log(LOG_WARNING, "%s: 'f/control message format' dialstring parameter value missing or invalid. "
                                "Defaulting to 'plain-text'\n",
-                               ast_channel_name(requestor));
+                               requestor_name);
                        instance->control_msg_format = WEBCHAN_CONTROL_MSG_FORMAT_PLAIN;
                }
        } else if (global_cfg) {
@@ -1705,7 +1705,7 @@ static struct ast_channel *webchan_request(const char *type,
        chan = ast_channel_alloc(1, AST_STATE_DOWN, "", "", "", "", "", assignedids,
                requestor, 0, "WebSocket/%s/%p", args.connection_id, instance);
        if (!chan) {
-               ast_log(LOG_ERROR, "%s: Unable to alloc channel\n", ast_channel_name(requestor));
+               ast_log(LOG_ERROR, "%s: Unable to alloc channel\n", requestor_name);
                goto failure;
        }