openssl
/
openssl
mirror of https://github.com/openssl/openssl
1
0
Fork 0
Code Issues Releases Wiki Activity

cmp.c: Avoid dereference with negative index and use memcpy 

This prevents a compile-time warning on newer gcc.

Also fix the related warning message.

Fixes #16814

Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16821)
This commit is contained in:
Tomas Mraz 2021-10-13 09:00:31 +02:00
parent 7e35458b51
commit 767db672c4
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
apps/cmp.c
View File

@ -1989,7 +1989,7 @@ static void print_itavs(STACK_OF(OSSL_CMP_ITAV) *itavs)
}
static char opt_item[SECTION_NAME_MAX + 1];
/* get previous name from a comma-separated list of names */
/* get previous name from a comma or space-separated list of names */
static const char *prev_item(const char *opt, const char *end)
{
const char *beg;
@ -1998,19 +1998,28 @@ static const char *prev_item(const char *opt, const char *end)
if (end == opt)
return NULL;
beg = end;
while (beg != opt && beg[-1] != ',' && !isspace(beg[-1]))
beg--;
while (beg > opt) {
--beg;
if (beg[0] == ',' || isspace(beg[0])) {
++beg;
break;
}
}
len = end - beg;
if (len > SECTION_NAME_MAX) {
CMP_warn2("using only first %d characters of section name starting with \"%s\"",
SECTION_NAME_MAX, opt_item);
CMP_warn3("using only first %d characters of section name starting with \"%.*s\"",
SECTION_NAME_MAX, SECTION_NAME_MAX, beg);
len = SECTION_NAME_MAX;
}
strncpy(opt_item, beg, len);
opt_item[SECTION_NAME_MAX] = '\0'; /* avoid gcc v8 O3 stringop-truncation */
memcpy(opt_item, beg, len);
opt_item[len] = '\0';
while (beg != opt && (beg[-1] == ',' || isspace(beg[-1])))
beg--;
while (beg > opt) {
--beg;
if (beg[0] != ',' && !isspace(beg[0])) {
++beg;
break;
}
}
return beg;
}