sysmocom
/
asterisk
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "stasis: Allow empty application arguments to move." into 16

This commit is contained in:
Joshua C. Colp 2019-03-13 11:32:09 -05:00 committed by Gerrit Code Review
parent 19957fc60e 03c0d19cc8
commit d3c971c315
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
res/stasis/control.c
View File

@ -453,16 +453,21 @@ int stasis_app_control_move(struct stasis_app_control *control, const char *app_
struct stasis_app_control_move_data *move_data;
size_t size;
size = sizeof(*move_data) + strlen(app_name) + strlen(app_args) + 2;
size = sizeof(*move_data) + strlen(app_name) + 1;
if (app_args) {
/* Application arguments are optional */
size += strlen(app_args) + 1;
}
if (!(move_data = ast_calloc(1, size))) {
return -1;
}
move_data->app_name = (char *)move_data + sizeof(*move_data);
move_data->app_args = move_data->app_name + strlen(app_name) + 1;
strcpy(move_data->app_name, app_name); /* Safe */
if (app_args) {
move_data->app_args = move_data->app_name + strlen(app_name) + 1;
strcpy(move_data->app_args, app_args); /* Safe */
} else {
move_data->app_args = NULL;