summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorDr. David von Oheimb <David.von.Oheimb@siemens.com>2021-09-11 23:08:13 +0200
committerDr. David von Oheimb <dev@ddvo.net>2021-09-17 10:02:52 +0200
commit39a8d4e13219580c8c89a234d6db5d261408cadb (patch)
tree706812390f60f9e0feb6f04feae773cba16a6118 /apps
parente59bfbaa2dbd680f77e1121e382502bd522a466c (diff)
downloadopenssl-new-39a8d4e13219580c8c89a234d6db5d261408cadb.tar.gz
APPS/cmp.c: Move warning on overlong section name to make it effective again
Fixes #16585 Reviewed-by: Paul Dale <pauli@openssl.org> Reviewed-by: Tomas Mraz <tomas@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16586)
Diffstat (limited to 'apps')
-rw-r--r--apps/cmp.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/cmp.c b/apps/cmp.c
index 74c8cd71f1..170ac816f2 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -2001,14 +2001,14 @@ static const char *prev_item(const char *opt, const char *end)
while (beg != opt && beg[-1] != ',' && !isspace(beg[-1]))
beg--;
len = end - beg;
- if (len > SECTION_NAME_MAX)
+ if (len > SECTION_NAME_MAX) {
+ CMP_warn2("using only first %d characters of section name starting with \"%s\"",
+ SECTION_NAME_MAX, opt_item);
len = SECTION_NAME_MAX;
+ }
strncpy(opt_item, beg, len);
opt_item[SECTION_NAME_MAX] = '\0'; /* avoid gcc v8 O3 stringop-truncation */
opt_item[len] = '\0';
- if (len > SECTION_NAME_MAX)
- CMP_warn2("using only first %d characters of section name starting with \"%s\"",
- SECTION_NAME_MAX, opt_item);
while (beg != opt && (beg[-1] == ',' || isspace(beg[-1])))
beg--;
return beg;