From: Dr. David von Oheimb <David.von.Oheimb@siemens.com>
Date: Sat, 11 Sep 2021 21:08:13 +0000 (+0200)
Subject: APPS/cmp.c: Move warning on overlong section name to make it effective again
X-Git-Tag: openssl-3.2.0-alpha1~3565
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39a8d4e13219580c8c89a234d6db5d261408cadb;p=thirdparty%2Fopenssl.git

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)
---

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;