Security-58286.260.20.tar.gz

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

diff --git a/OSX/libsecurity_smime/lib/cmsreclist.c b/OSX/libsecurity_smime/lib/cmsreclist.c
index f9b194bcd5d55bc7f68f45742a2127aedad8fb7a..ecf3179eaff5c0c0f133d8c847f12e145472b554 100644 (file)
--- a/OSX/libsecurity_smime/lib/cmsreclist.c
+++ b/OSX/libsecurity_smime/lib/cmsreclist.c
@@ -98,7 +98,7 @@ nss_cms_recipients_traverse(SecCmsRecipientInfoRef *recipientinfos, SecCmsRecipi
                        break;
                    case SecCmsKeyAgreeRecipientIDRKeyID:
                        rle->kind = RLSubjKeyID;
                        break;
                    case SecCmsKeyAgreeRecipientIDRKeyID:
                        rle->kind = RLSubjKeyID;

-                       rle->id.subjectKeyID = rek->recipientIdentifier.id.recipientKeyIdentifier.subjectKeyIdentifier;
+                       rle->id.subjectKeyID = &rek->recipientIdentifier.id.recipientKeyIdentifier.subjectKeyIdentifier;

                        break;
                    }
                    recipient_list[rlindex++] = rle;
                        break;
                    }
                    recipient_list[rlindex++] = rle;


@@ -172,6 +172,7 @@ nss_cms_recipient_list_destroy(SecCmsRecipient **recipient_list)
            PK11_FreeSlot(recipient->slot);
 #endif
        PORT_Free(recipient);
            PK11_FreeSlot(recipient->slot);
 #endif
        PORT_Free(recipient);

+        recipient_list[i] = NULL;

     }
     PORT_Free(recipient_list);
 }
     }
     PORT_Free(recipient_list);
 }