X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=cli%2Fbabeltrace-cfg-cli-args.c;h=2978ab48a03f43ef3f539a0e14787cc6fae09b2c;hb=2c212c058851bd675a5ff33ac0bff981458497be;hp=95a807be34e64937eb30ef8d0ba7ec2eba360d2c;hpb=291a6dc5f5d668743507c16c9f88e270049d876e;p=babeltrace.git

diff --git a/cli/babeltrace-cfg-cli-args.c b/cli/babeltrace-cfg-cli-args.c
index 95a807be..2978ab48 100644
--- a/cli/babeltrace-cfg-cli-args.c
+++ b/cli/babeltrace-cfg-cli-args.c
@@ -2719,7 +2719,7 @@ struct bt_config *bt_config_run_from_args_array(struct bt_value *run_args,
 {
 	struct bt_config *cfg = NULL;
 	const char **argv;
-	size_t i;
+	int64_t i, len;
 	const size_t argc = bt_value_array_size(run_args) + 1;
 
 	argv = calloc(argc, sizeof(*argv));
@@ -2730,7 +2730,12 @@ struct bt_config *bt_config_run_from_args_array(struct bt_value *run_args,
 
 	argv[0] = "run";
 
-	for (i = 0; i < bt_value_array_size(run_args); i++) {
+	len = bt_value_array_size(run_args);
+	if (len < 0) {
+		printf_err("Invalid executable arguments\n");
+		goto end;
+	}
+	for (i = 0; i < len; i++) {
 		int ret;
 		struct bt_value *arg_value = bt_value_array_get(run_args, i);
 		const char *arg;
@@ -4654,6 +4659,11 @@ struct bt_config *bt_config_convert_from_args(int argc, const char *argv[],
 	 * here.
 	 */
 	if (print_run_args || print_run_args_0) {
+		if (stream_intersection_mode) {
+			printf_err("Cannot specify --stream-intersection with --run-args or --run-args-0\n");
+			goto error;
+		}
+
 		for (i = 0; i < bt_value_array_size(run_args); i++) {
 			struct bt_value *arg_value =
 				bt_value_array_get(run_args, i);