diff options
| author | wtc%google.com <devnull@localhost> | 2007-12-12 00:50:58 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2007-12-12 00:50:58 +0000 |
| commit | 50ce7c2fc3ef8f011aeb57a6d6994d0859460ca6 (patch) | |
| tree | c0c0d60bc3f035d5da803449738831277fa31428 | |
| parent | f25b117c9da91f08edbf3a23547cbef958f9a451 (diff) | |
| download | nss-hg-50ce7c2fc3ef8f011aeb57a6d6994d0859460ca6.tar.gz | |
Bug 396045: move the NULL check to the correct position in the code. The
patch is contributed by Bruno 'Aqualon' Escherl <aqualon@aquachan.de>.
r=rrelyea,wtc
| -rw-r--r-- | security/nss/lib/ckfw/mechanism.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/security/nss/lib/ckfw/mechanism.c b/security/nss/lib/ckfw/mechanism.c index 02f9ca973..066278f07 100644 --- a/security/nss/lib/ckfw/mechanism.c +++ b/security/nss/lib/ckfw/mechanism.c @@ -716,9 +716,6 @@ nssCKFWMechanism_VerifyInit if ( (void *)NULL == (void *)fwMechanism->mdMechanism->VerifyInit) { return CKR_FUNCTION_FAILED; } - if ((NSSCKMDCryptoOperation *)NULL == mdOperation) { - goto loser; - } mdSession = nssCKFWSession_GetMDSession(fwSession); mdObject = nssCKFWObject_GetMDObject(fwObject); @@ -736,6 +733,9 @@ nssCKFWMechanism_VerifyInit fwObject, &error ); + if ((NSSCKMDCryptoOperation *)NULL == mdOperation) { + goto loser; + } fwOperation = nssCKFWCryptoOperation_Create(mdOperation, mdSession, fwSession, fwMechanism->mdToken, fwMechanism->fwToken, |