Correctly handle errors in CMS I/O code.

diff --git a/crypto/asn1/asn_mime.c b/crypto/asn1/asn_mime.c
index 8fbdf21337653fe99f2cd1d97fd5658b082ba382..c1d1b12291c4b99a9043cbf1771ef3c2b4291f22 100644 (file)
--- a/crypto/asn1/asn_mime.c
+++ b/crypto/asn1/asn_mime.c
@@ -592,6 +592,8 @@ 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;
 }
 

diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c
index 8e3221b7269ed77427edee600bd8f9364abfaf34..dec8ef32f87d76df48866807bf01a9150fc4c6d7 100644 (file)
--- a/crypto/cms/cms_smime.c
+++ b/crypto/cms/cms_smime.c
@@ -89,11 +89,13 @@ static int cms_copy_content(BIO *out, BIO *in, unsigned int flags)
                                if (!BIO_get_cipher_status(in))
                                        goto err;
                                }
+                       if (i < 0)
+                               goto err;
                        break;
                        }
                                
-               if (tmpout)
-                       BIO_write(tmpout, buf, i);
+               if (tmpout && (BIO_write(tmpout, buf, i) != i))
+                       goto err;
        }
 
        if(flags & CMS_TEXT)