clang: fix malloc() warning with assert

Change-Id: I989d2655622a9f11f4a0a2994014e42822587ecd
Signed-off-by: Øyvind Harboe <oyvind.harboe@zylin.com>
Reviewed-on: http://openocd.zylin.com/41
Tested-by: jenkins
Reviewed-by: Øyvind Harboe <oyvindharboe@gmail.com>

diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 3b2f83b5aef4b6a3c063cdf2ba82b1c6a9cd4d34..468edf5e511c169823b126660dcbe215bdc018b4 100644 (file)
--- a/src/jtag/tcl.c
+++ b/src/jtag/tcl.c
@@ -172,6 +172,7 @@ static int Jim_Command_drscan(Jim_Interp *interp, int argc, Jim_Obj *const *args
        }
 
        num_fields = (argc-2)/2;
+       assert(num_fields > 0);
        fields = malloc(sizeof(struct scan_field) * num_fields);
        for (i = 2; i < argc; i += 2)
        {

diff --git a/src/target/image.c b/src/target/image.c
index 21ce11f630c08774bfa0a12febf55848e1a399a0..8f437c035797a7901ed9295f2ada0cc5427d89b2 100644 (file)
--- a/src/target/image.c
+++ b/src/target/image.c
@@ -473,6 +473,8 @@ static int image_elf_read_headers(struct image *image)
                if ((field32(elf, elf->segments[i].p_type) == PT_LOAD) && (field32(elf, elf->segments[i].p_filesz) != 0))
                        image->num_sections++;
 
+       assert(image->num_sections > 0);
+
        /**
         * some ELF linkers produce binaries with *all* the program header
         * p_paddr fields zero (there can be however one loadable segment