From: Dr. David von Oheimb <dev@ddvo.net>
Date: Mon, 14 Apr 2025 09:52:11 +0000 (+0200)
Subject: SMIME_text(): add missing I/O error checking
X-Git-Tag: openssl-3.6.0-alpha1~749
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f953185b2ae0c9c7c2d018ac5b230c59e059cc5;p=thirdparty%2Fopenssl.git

SMIME_text(): add missing I/O error checking

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Dmitry Belyavskiy <beldmit@gmail.com>
(Merged from https://github.com/openssl/openssl/pull/27368)
---

diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index fc0a73c5664..8c99b6ba3dc 100644
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -633,10 +633,9 @@ int SMIME_text(BIO *in, BIO *out)
     }
     sk_MIME_HEADER_pop_free(headers, mime_hdr_free);
     while ((len = BIO_read(in, iobuf, sizeof(iobuf))) > 0)
-        BIO_write(out, iobuf, len);
-    if (len < 0)
-        return 0;
-    return 1;
+        if (BIO_write(out, iobuf, len) != len && out != NULL)
+            return 0;
+    return len >= 0;
 }
 
 /*