Add missing zero-size destination checks in cmdline helper routines.
Always check for size == 0, before doing an assignment of '\0' to string
position of "size - 1".

Fixes: af75078fece3 ("first public release")
Cc: [email protected]

Signed-off-by: Bruce Richardson <[email protected]>
---
 lib/cmdline/cmdline_parse_num.c    | 2 +-
 lib/cmdline/cmdline_parse_string.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/cmdline/cmdline_parse_num.c b/lib/cmdline/cmdline_parse_num.c
index f21796bedb..4cfc900391 100644
--- a/lib/cmdline/cmdline_parse_num.c
+++ b/lib/cmdline/cmdline_parse_num.c
@@ -323,7 +323,7 @@ cmdline_get_help_num(cmdline_parse_token_hdr_t *tk, char 
*dstbuf, unsigned int s
        struct cmdline_token_num_data nd;
        int ret;
 
-       if (!tk)
+       if (!tk || !dstbuf || size == 0)
                return -1;
 
        memcpy(&nd, &((struct cmdline_token_num *)tk)->num_data, sizeof(nd));
diff --git a/lib/cmdline/cmdline_parse_string.c 
b/lib/cmdline/cmdline_parse_string.c
index 731947159f..33cf89f84f 100644
--- a/lib/cmdline/cmdline_parse_string.c
+++ b/lib/cmdline/cmdline_parse_string.c
@@ -171,6 +171,9 @@ int 
cmdline_complete_get_elt_string(cmdline_parse_token_hdr_t *tk, int idx,
        if (!tk || !dstbuf || idx < 0)
                return -1;
 
+       if (size == 0)
+               return -1;
+
        tk2 = (struct cmdline_token_string *)tk;
        sd = &tk2->string_data;
 
-- 
2.51.0

Reply via email to