From 0d6d8807793e74402e23772062469aeb4808dd48 Mon Sep 17 00:00:00 2001 From: "faqiang.zhu" Date: Thu, 18 Apr 2019 10:51:28 +0800 Subject: [PATCH] MA-14629 fix build warnings for varialbe initialization and type cast initialize potential uninitialized variable with the type of"char*" to be NULL in AVB. That "hashtree_error_mode" in code is manually specified with a known value, the cases listed cover all potential value of "hashtree_error_mode" explicitly do a type cast for memcpy parameters. Change-Id: Ie5d234422a273d6dab75585bd0d8eb81583707ca Signed-off-by: faqiang.zhu --- board/freescale/imx8qm_mek/imx8qm_mek.c | 2 +- lib/avb/libavb/avb_cmdline.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/board/freescale/imx8qm_mek/imx8qm_mek.c b/board/freescale/imx8qm_mek/imx8qm_mek.c index 629d052..b32e522 100644 --- a/board/freescale/imx8qm_mek/imx8qm_mek.c +++ b/board/freescale/imx8qm_mek/imx8qm_mek.c @@ -570,7 +570,7 @@ int board_late_init(void) end_of_uboot += 9; /* load hdmitxfw.bin and hdmirxfw.bin*/ - memcpy(IMX_HDMI_FIRMWARE_LOAD_ADDR, end_of_uboot, + memcpy((void *)IMX_HDMI_FIRMWARE_LOAD_ADDR, end_of_uboot, IMX_HDMITX_FIRMWARE_SIZE + IMX_HDMIRX_FIRMWARE_SIZE); sprintf(command, "hdp load 0x%x", IMX_HDMI_FIRMWARE_LOAD_ADDR); diff --git a/lib/avb/libavb/avb_cmdline.c b/lib/avb/libavb/avb_cmdline.c index 3f4b99a..ce33159 100644 --- a/lib/avb/libavb/avb_cmdline.c +++ b/lib/avb/libavb/avb_cmdline.c @@ -222,7 +222,7 @@ AvbSlotVerifyResult avb_append_options( AvbAlgorithmType algorithm_type, AvbHashtreeErrorMode hashtree_error_mode) { AvbSlotVerifyResult ret; - const char* verity_mode; + const char* verity_mode = NULL; bool is_device_unlocked; AvbIOResult io_ret; @@ -320,7 +320,7 @@ AvbSlotVerifyResult avb_append_options( if (toplevel_vbmeta->flags & AVB_VBMETA_IMAGE_FLAGS_HASHTREE_DISABLED) { verity_mode = "disabled"; } else { - const char* dm_verity_mode; + const char* dm_verity_mode = NULL; char* new_ret; switch (hashtree_error_mode) { -- 1.9.1