Security-58286.260.20.tar.gz

[apple/security.git] / OSX / libsecurity_smime / lib / cmsdigest.c

diff --git a/OSX/libsecurity_smime/lib/cmsdigest.c b/OSX/libsecurity_smime/lib/cmsdigest.c
index 52e0748070731ef29b5342f5d4e89eba40a34aa9..cbdc0912215424698cb8fdfb26e0c5dfa49ec7f3 100644 (file)
--- a/OSX/libsecurity_smime/lib/cmsdigest.c
+++ b/OSX/libsecurity_smime/lib/cmsdigest.c
@@ -193,8 +193,6 @@ SecCmsDigestContextFinishMultiple(SecCmsDigestContextRef cmsdigcx, SecArenaPoolR
                 cmsdigcx->digobjs[i] = 0;
             }
        rv = SECSuccess;
                 cmsdigcx->digobjs[i] = 0;
             }
        rv = SECSuccess;

-       if (digestsp)
-           *digestsp = NULL;

        goto cleanup;
     }
 
        goto cleanup;
     }
 


@@ -263,6 +261,7 @@ loser:
 
 cleanup:
     if (cmsdigcx->digcnt > 0) {
 
 cleanup:
     if (cmsdigcx->digcnt > 0) {

+        SecCmsDigestContextCancel(cmsdigcx);

        PORT_Free(cmsdigcx->digobjs);
         cmsdigcx->digobjs = NULL;
         cmsdigcx->digcnt = 0;
        PORT_Free(cmsdigcx->digobjs);
         cmsdigcx->digobjs = NULL;
         cmsdigcx->digcnt = 0;