From: Eugene Syromiatnikov <esyr@openssl.org>
Date: Tue, 5 Aug 2025 13:19:12 +0000 (+0200)
Subject: crypto/bio/bio_print.c: fix space padding calculation
X-Git-Tag: openssl-3.6.0-alpha1~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=badbcc663192d9599f8435c1392fae09924de0c7;p=thirdparty%2Fopenssl.git

crypto/bio/bio_print.c: fix space padding calculation

Sign, prefix, and zero padding should count towards precision.

Signed-off-by: Eugene Syromiatnikov <esyr@openssl.org>

Reviewed-by: Saša Nedvědický <sashan@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/28177)
---

diff --git a/crypto/bio/bio_print.c b/crypto/bio/bio_print.c
index 6f67a870b65..d08b37370fa 100644
--- a/crypto/bio/bio_print.c
+++ b/crypto/bio/bio_print.c
@@ -500,16 +500,16 @@ fmtint(char **sbuffer,
      *     if necessary, to force the first digit of the result to be a zero
      */
     zpadlen = max - place - (prefix == oct_prefix);
-    spadlen =
-        min - OSSL_MAX(max, place) - (signvalue ? 1 : 0) - (int)strlen(prefix);
     if (zpadlen < 0)
         zpadlen = 0;
+    spadlen =
+        min - OSSL_MAX(max, place + zpadlen + (signvalue ? 1 : 0) + (int)strlen(prefix));
     if (spadlen < 0)
         spadlen = 0;
     if (flags & DP_F_MINUS) {
         spadlen = -spadlen;
     } else if (flags & DP_F_ZERO) {
-        zpadlen = OSSL_MAX(zpadlen, spadlen);
+        zpadlen = zpadlen + spadlen;
         spadlen = 0;
     }