From 39a8d4e13219580c8c89a234d6db5d261408cadb Mon Sep 17 00:00:00 2001 From: "Dr. David von Oheimb" Date: Sat, 11 Sep 2021 23:08:13 +0200 Subject: [PATCH] APPS/cmp.c: Move warning on overlong section name to make it effective again Fixes #16585 Reviewed-by: Paul Dale Reviewed-by: Tomas Mraz (Merged from https://github.com/openssl/openssl/pull/16586) --- apps/cmp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/cmp.c b/apps/cmp.c index 74c8cd71f1a..170ac816f2a 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; -- 2.47.2