From 8b192df59a10df105af3cff1551f5181deea83d6 Mon Sep 17 00:00:00 2001 From: Paul Fertser Date: Thu, 18 Jan 2018 11:59:10 +0300 Subject: [PATCH] svf: improve robustness when processing invalid SVF files Uninitialized argument value warnings reported by clang static analizer. Change-Id: I30af4900f517ffc0a7282689b58c7a224cdc080a Signed-off-by: Paul Fertser Reviewed-on: http://openocd.zylin.com/4356 Tested-by: jenkins --- src/svf/svf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/svf/svf.c b/src/svf/svf.c index 1d686ba6..223af7e1 100644 --- a/src/svf/svf.c +++ b/src/svf/svf.c @@ -741,6 +741,9 @@ parse_char: pos++; } + if (num == 0) + return ERROR_FAIL; + *num_of_argu = num; return ERROR_OK; @@ -1313,7 +1316,7 @@ XXR_common: * SEC]] [ENDSTATE end_state] */ /* RUNTEST [run_state] min_time SEC [MAXIMUM max_time SEC] [ENDSTATE * end_state] */ - if ((num_of_argu < 3) && (num_of_argu > 11)) { + if ((num_of_argu < 3) || (num_of_argu > 11)) { LOG_ERROR("invalid parameter of %s", argus[0]); return ERROR_FAIL; } -- 2.39.5