Security-57740.1.18.tar.gz

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

diff --git a/OSX/libsecurity_smime/lib/cmsdigdata.c b/OSX/libsecurity_smime/lib/cmsdigdata.c
index 8fb7d5e5fb1e4779a0330ff775d819cc1b6e956a..d850ece4db4fd4a5e8ece78f326be874dc3acc9c 100644 (file)
--- a/OSX/libsecurity_smime/lib/cmsdigdata.c
+++ b/OSX/libsecurity_smime/lib/cmsdigdata.c
@@ -89,6 +89,9 @@ loser:
 void
 SecCmsDigestedDataDestroy(SecCmsDigestedDataRef digd)
 {
 void
 SecCmsDigestedDataDestroy(SecCmsDigestedDataRef digd)
 {

+    if (digd == NULL) {
+        return;
+    }

     /* everything's in a pool, so don't worry about the storage */
     SecCmsContentInfoDestroy(&(digd->contentInfo));
     return;
     /* everything's in a pool, so don't worry about the storage */
     SecCmsContentInfoDestroy(&(digd->contentInfo));
     return;


@@ -218,6 +221,9 @@ SecCmsDigestedDataDecodeAfterData(SecCmsDigestedDataRef digd)
 OSStatus
 SecCmsDigestedDataDecodeAfterEnd(SecCmsDigestedDataRef digd)
 {
 OSStatus
 SecCmsDigestedDataDecodeAfterEnd(SecCmsDigestedDataRef digd)
 {

+    if (!digd) {
+        return SECFailure;
+    }

     /* did we have digest calculation going on? */
     if (digd->cdigest.Length != 0) {
        /* XXX comparision btw digest & cdigest */
     /* did we have digest calculation going on? */
     if (digd->cdigest.Length != 0) {
        /* XXX comparision btw digest & cdigest */