From beba56bd10d53dbae2a71afd2de1e6b3949062eb Mon Sep 17 00:00:00 2001 From: Jihoon Kim Date: Mon, 25 Jul 2022 09:49:52 +0900 Subject: [PATCH] Fix issue detected by static analysis tool (#1 of 1): Explicit null dereferenced (FORWARD_NULL) 3. var_deref_model: Passing null pointer v to memcpy, which dereferences it Change-Id: I3bbae39553aa34ebd80a319d6f731c4f2074e95d Signed-off-by: Jihoon Kim --- client/ma_dbus.c | 3 ++- client/ma_ui.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/ma_dbus.c b/client/ma_dbus.c index 01ee6a7..a63b082 100644 --- a/client/ma_dbus.c +++ b/client/ma_dbus.c @@ -85,7 +85,8 @@ static void message_port_cb(int local_port_id, MA_SLOGE("[ERROR] bundle contains data bigger than %d : %zu", STREAMING_BUFFER_SIZE, size); //LCOV_EXCL_LINE return; } else { - memcpy(buffer, v, size); + if (v) + memcpy(buffer, v, size); } memcpy(pending_buffer + pending_buffer_size, buffer, size); diff --git a/client/ma_ui.c b/client/ma_ui.c index 216cd1c..6257551 100644 --- a/client/ma_ui.c +++ b/client/ma_ui.c @@ -725,8 +725,8 @@ int ma_ui_set_default_assistant(const char* app_id) return MA_ERROR_INVALID_STATE; } - ret = -1; -/* ret = ma_config_mgr_set_default_assistant(app_id); +/* ret = -1; + ret = ma_config_mgr_set_default_assistant(app_id); if (0 != ret) { MAUI_SLOGE("[UI ERROR] Fail to set default assistant")_; } -- 2.34.1