Commit aa701624 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

Err isn't always malloc failure. 



Reviewed-by: default avatarMatt Caswell <matt@openssl.org>
(cherry picked from commit a187e08d)

Conflicts:
	crypto/cms/cms_smime.c
parent 396e3004

crypto/cms/cms_smime.c

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,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;

    }