From: Tomas Vanek Date: Tue, 10 Dec 2019 19:12:58 +0000 (+0100) Subject: flash/nor/kinetis: fix clang static analyzer warnings X-Git-Tag: v0.11.0-rc1~540 X-Git-Url: https://review.openocd.org/gitweb?p=openocd.git;a=commitdiff_plain;h=bb1c7ae4ae23a507175e751c705ad543ea2e9953;hp=0750a7c085b0fb8b195b210a6835c93ea88a19f3;ds=sidebyside flash/nor/kinetis: fix clang static analyzer warnings Use assert to remove "Dereference of null pointer" warnings. Change-Id: Ie204c234a71758e6470351e1d9f22da3dd887f56 Signed-off-by: Tomas Vanek Reviewed-on: http://openocd.zylin.com/5357 Tested-by: jenkins Reviewed-by: Antonio Borneo --- diff --git a/src/flash/nor/kinetis.c b/src/flash/nor/kinetis.c index 687a3370b3..1d63352823 100644 --- a/src/flash/nor/kinetis.c +++ b/src/flash/nor/kinetis.c @@ -1443,6 +1443,8 @@ static int kinetis_fill_fcf(struct flash_bank *bank, uint8_t *fcf) kinetis_auto_probe(bank_iter); + assert(bank_iter->prot_blocks); + if (k_bank->flash_class == FC_PFLASH) { for (i = 0; i < bank_iter->num_prot_blocks; i++) { if (bank_iter->prot_blocks[i].is_protected == 1) @@ -2624,7 +2626,10 @@ static int kinetis_probe(struct flash_bank *bank) unsigned num_blocks, first_nvm_bank; uint32_t size_k; struct kinetis_flash_bank *k_bank = bank->driver_priv; - struct kinetis_chip *k_chip = k_bank->k_chip; + struct kinetis_chip *k_chip; + + assert(k_bank); + k_chip = k_bank->k_chip; k_bank->probed = false;