From 927d030ae86335536b3bfdf9ce3aca98105a7f68 Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Mon, 5 Nov 2018 20:37:09 +0100 Subject: layer23: Avoid mempcy with NULL src Fixes following ASan warning: git/osmocom-bb/src/host/layer23/src/misc/../common/main.c:146:2: runtime error: null pointer passed as argument 2, which is declared to never be null The warning however is harmless since in that case, app_len = 0 and thus size to copy is 0. Change-Id: I009a5b53f1e5be72ce347d64d3a7cb1d95d37ea3 --- src/host/layer23/src/common/main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/host/layer23/src/common/main.c b/src/host/layer23/src/common/main.c index 693b10e7..2920cd9e 100644 --- a/src/host/layer23/src/common/main.c +++ b/src/host/layer23/src/common/main.c @@ -143,7 +143,8 @@ static void build_config(char **opt, struct option **option) *option = talloc_zero_array(l23_ctx, struct option, len + app_len + 1); memcpy(*option, long_options, sizeof(long_options)); - memcpy(*option + len, app_opp, app_len * sizeof(struct option)); + if (app_opp) + memcpy(*option + len, app_opp, app_len * sizeof(struct option)); } static void handle_options(int argc, char **argv) -- cgit v1.2.3