From: Dr. Stephen Henson Date: Sat, 1 Aug 2015 14:37:01 +0000 (+0100) Subject: Err isn't always malloc failure. X-Git-Tag: OpenSSL_1_0_2e~139 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=e9da86627a271d9d1ad04e47115d26fab4a21c1b;p=oweals%2Fopenssl.git Err isn't always malloc failure. Reviewed-by: Matt Caswell (cherry picked from commit a187e08d856690b5c1da3184d0ff560d572f893b) Conflicts: crypto/cms/cms_smime.c --- diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index 5522a376ac..07e3472e10 100644 --- a/crypto/cms/cms_smime.c +++ b/crypto/cms/cms_smime.c @@ -754,7 +754,7 @@ int CMS_final(CMS_ContentInfo *cms, BIO *data, BIO *dcont, unsigned int flags) BIO *cmsbio; int ret = 0; if (!(cmsbio = CMS_dataInit(cms, dcont))) { - CMSerr(CMS_F_CMS_FINAL, ERR_R_MALLOC_FAILURE); + CMSerr(CMS_F_CMS_FINAL, CMS_R_CMS_LIB); return 0; }