From 838e1578072900d1f98dfb31cc538940d2fad876 Mon Sep 17 00:00:00 2001 From: Luiz Augusto von Dentz Date: Mon, 10 Jul 2023 12:28:42 -0700 Subject: [PATCH] advertising: Fix build warning This fixes the following warning: src/advertising.c:942:2: warning: Null pointer passed to 2nd parameter expecting 'nonnull' [core.NonNullParamChecker] memcpy(cp->data + adv_data_len, scan_rsp, scan_rsp_len); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ --- src/advertising.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/advertising.c b/src/advertising.c index 6332ec8f9..d959bf38f 100644 --- a/src/advertising.c +++ b/src/advertising.c @@ -939,7 +939,9 @@ static int refresh_legacy_adv(struct btd_adv_client *client, cp->adv_data_len = adv_data_len; cp->scan_rsp_len = scan_rsp_len; memcpy(cp->data, adv_data, adv_data_len); - memcpy(cp->data + adv_data_len, scan_rsp, scan_rsp_len); + + if (scan_rsp) + memcpy(cp->data + adv_data_len, scan_rsp, scan_rsp_len); free(adv_data); free(scan_rsp); -- 2.47.3