From f0254cc1e94093b873dc1ac90ae700fdaebfcda7 Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Wed, 13 Mar 2019 08:05:57 -0300
Subject: [PATCH] stasis: Allow empty application arguments to move.
Change-Id: I1e4d37415f3034abe36496dc30209c2303e6af5c
---
res/stasis/control.c | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/res/stasis/control.c b/res/stasis/control.c
index 05f2fd318a..4e2490d8b7 100644
--- a/res/stasis/control.c
+++ b/res/stasis/control.c
@@ -525,16 +525,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;
--
GitLab