зеркало из https://github.com/mozilla/pjs.git
Patch contributed by timeless@bemail.org
[Bug 336992] crash [@ pk11_DoKeys] "arg" Pointer dereferenced before NULL check. r=nelson
This commit is contained in:
Родитель
bbe6e8f9c5
Коммит
6f023dcf53
|
@ -1729,6 +1729,9 @@ pk11_DoKeys(PK11SlotInfo *slot, CK_OBJECT_HANDLE keyHandle, void *arg)
|
|||
SECStatus rv = SECSuccess;
|
||||
SECKEYPrivateKey *privKey;
|
||||
pk11KeyCallback *keycb = (pk11KeyCallback *) arg;
|
||||
if (!arg) {
|
||||
return SECFailure;
|
||||
}
|
||||
|
||||
privKey = PK11_MakePrivKey(slot,nullKey,PR_TRUE,keyHandle,keycb->wincx);
|
||||
|
||||
|
@ -1736,7 +1739,7 @@ pk11_DoKeys(PK11SlotInfo *slot, CK_OBJECT_HANDLE keyHandle, void *arg)
|
|||
return SECFailure;
|
||||
}
|
||||
|
||||
if (keycb && (keycb->callback)) {
|
||||
if (keycb->callback) {
|
||||
rv = (*keycb->callback)(privKey,keycb->callbackArg);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче