From 979b576e2007bef33728937e02bca6c6cffd21fa Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Sat, 1 Aug 2015 15:37:01 +0100 Subject: Err isn't always malloc failure. Reviewed-by: Matt Caswell (cherry picked from commit a187e08d856690b5c1da3184d0ff560d572f893b) Conflicts: crypto/cms/cms_smime.c --- crypto/cms/cms_smime.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto/cms/cms_smime.c b/crypto/cms/cms_smime.c index 5522a37..07e3472 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; } -- 1.7.12.1