aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorØyvind Harboe <oyvind.harboe@zylin.com>2011-10-21 19:00:09 +0200
committerØyvind Harboe <oyvindharboe@gmail.com>2011-10-23 11:55:02 +0000
commit4e079d18bffaed0372ab5b2f13cfd5d14db79d21 (patch)
tree9744bdd6ed84db44253c3b711d116f37e7f886ce
parent0577ba8331080f57966d06e6aced1c061d228bb9 (diff)
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>
-rw-r--r--src/jtag/tcl.c1
-rw-r--r--src/target/image.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/jtag/tcl.c b/src/jtag/tcl.c
index 3b2f83b5..468edf5e 100644
--- 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 21ce11f6..8f437c03 100644
--- 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