From: Joshua Colp <jcolp@digium.com>
Date: Wed, 13 Mar 2019 11:05:57 +0000 (-0300)
Subject: stasis: Allow empty application arguments to move.
X-Git-Tag: 17.0.0-rc1~143^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1d074debfb84faed21799315ce5a34105343663d;p=thirdparty%2Fasterisk.git

stasis: Allow empty application arguments to move.

Change-Id: I1e4d37415f3034abe36496dc30209c2303e6af5c
---

diff --git a/res/stasis/control.c b/res/stasis/control.c
index 3e16e803f2..e209a6a357 100644
--- a/res/stasis/control.c
+++ b/res/stasis/control.c
@@ -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;