kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-20 08:40:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

ARI: Fix crash when POST /playback/{id}/control does not have an operation parameter.

Browse Source 
(closes issue ASTERISK-22680)
Reported by: John Bigelow


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/12@401107 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Richard Mudgett
2013-10-16 21:20:21 +00:00
parent 0fc343958a
commit ec516d1896
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
res/ari/resource_playback.c
View File

@@ -68,7 +68,6 @@ void ast_ari_stop_playback(struct ast_variable *headers,
} }
res = stasis_app_playback_operation(playback, STASIS_PLAYBACK_STOP); res = stasis_app_playback_operation(playback, STASIS_PLAYBACK_STOP);
switch (res) { switch (res) {
case STASIS_PLAYBACK_OPER_OK: case STASIS_PLAYBACK_OPER_OK:
ast_ari_response_no_content(response); ast_ari_response_no_content(response);
@@ -93,6 +92,11 @@ void ast_ari_control_playback(struct ast_variable *headers,
enum stasis_app_playback_media_operation oper; enum stasis_app_playback_media_operation oper;
enum stasis_playback_oper_results res; enum stasis_playback_oper_results res;
if (!args->operation) {
ast_ari_response_error(response, 400,
"Bad Request", "Missing operation");
return;
}
if (strcmp(args->operation, "unpause") == 0) { if (strcmp(args->operation, "unpause") == 0) {
oper = STASIS_PLAYBACK_UNPAUSE; oper = STASIS_PLAYBACK_UNPAUSE;
} else if (strcmp(args->operation, "pause") == 0) { } else if (strcmp(args->operation, "pause") == 0) {
@@ -108,7 +112,6 @@ void ast_ari_control_playback(struct ast_variable *headers,
"Bad Request", "Invalid operation %s", "Bad Request", "Invalid operation %s",
args->operation); args->operation);
return; return;
} }
playback = stasis_app_playback_find_by_id(args->playback_id); playback = stasis_app_playback_find_by_id(args->playback_id);
@@ -119,7 +122,6 @@ void ast_ari_control_playback(struct ast_variable *headers,
} }
res = stasis_app_playback_operation(playback, oper); res = stasis_app_playback_operation(playback, oper);
switch (res) { switch (res) {
case STASIS_PLAYBACK_OPER_OK: case STASIS_PLAYBACK_OPER_OK:
ast_ari_response_no_content(response); ast_ari_response_no_content(response);