Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-06 22:53:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug 327126 prevent missing JSContext during generateCRMFRequest() r=mrbkap, r=kengert, sr=dbaron

Browse Source
This commit is contained in:
dveditz%cruzio.com 2006-02-16 05:38:52 +00:00
parent f4d75982b7
commit bbb5617f66
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
security/manager/ssl/src/nsCrypto.cpp
View File

@ -69,6 +69,7 @@
#include "nsIDOMCryptoDialogs.h"
#include "nsIFormSigningDialog.h"
#include "nsIProxyObjectManager.h"
#include "nsIJSContextStack.h"
#include "jsapi.h"
#include "jsdbgapi.h"
#include <ctype.h>
@ -244,7 +245,7 @@ nsCrypto::~nsCrypto()
NS_IMETHODIMP
nsCrypto::SetEnableSmartCardEvents(PRBool aEnable)
{
nsresult rv;
nsresult rv = NS_OK;
// this has the side effect of starting the nssComponent (and initializing
// NSS) even if it isn't already going. Starting the nssComponent is a
@ -1774,15 +1775,23 @@ nsCryptoRunnable::Run()
if (NS_FAILED(rv))
return NS_ERROR_FAILURE;
// make sure the right context is on the stack. must not return w/out popping
nsCOMPtr<nsIJSContextStack> stack(do_GetService("@mozilla.org/js/xpc/ContextStack;1"));
if (!stack || NS_FAILED(stack->Push(cx))) {
return NS_ERROR_FAILURE;
}
jsval retval;
if (JS_EvaluateScriptForPrincipals(cx, m_args->m_scope, principals,
m_args->m_jsCallback,
strlen(m_args->m_jsCallback),
nsnull, 0,
&retval) != JS_TRUE) {
return NS_ERROR_FAILURE;
rv = NS_ERROR_FAILURE;
}
return NS_OK;
stack->Pop(nsnull);
return rv;
}
//Quick helper function to check if a newly issued cert