From 1da8d15ab5d1681b89567987fac70ca3b0703ba6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Thu, 19 Sep 2019 14:18:50 -0400 Subject: [PATCH] Revert "lttng: fix: out-of-bounds copy of original 'view' command arguments" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This reverts commit fc1465822a1075d98160bb74ae8e974ac8c010a8 as it broke the 'lttng view' command on live sessions. The original commit was meant to fix a warning, but it was (evidently) not an appropriate change. Signed-off-by: Jérémie Galarneau --- src/bin/lttng/commands/view.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/lttng/commands/view.c b/src/bin/lttng/commands/view.c index 237ea4a15..0325e505c 100644 --- a/src/bin/lttng/commands/view.c +++ b/src/bin/lttng/commands/view.c @@ -188,7 +188,7 @@ static char **alloc_argv_from_local_opts(const char **opts, size_t opts_len, goto error; } - memcpy(argv, opts, opts_len); + memcpy(argv, opts, size); if (session_live_mode) { argv[opts_len] = "-i"; -- 2.34.1