mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-02 01:48:05 +00:00
checking in for scc.
bug #85271: avoid regressions by re-creating the old behavior near |nsCRT::strdup|, see bug #86316
This commit is contained in:
parent
d230ec28ee
commit
ad4e9b47c8
@ -1546,7 +1546,7 @@ nsCrypto::GenerateCRMFRequest(nsIDOMCRMFObject** aReturn)
|
|||||||
|
|
||||||
args->m_cx = cx;
|
args->m_cx = cx;
|
||||||
args->m_scope = JS_GetParent(cx, script_obj);
|
args->m_scope = JS_GetParent(cx, script_obj);
|
||||||
args->m_jsCallback.Adopt(nsCRT::strdup(jsCallback));
|
args->m_jsCallback.Adopt(jsCallback ? nsCRT::strdup(jsCallback) : 0);
|
||||||
args->m_principals = principals;
|
args->m_principals = principals;
|
||||||
|
|
||||||
nsCryptoRunnable *cryptoRunnable = new nsCryptoRunnable(args);
|
nsCryptoRunnable *cryptoRunnable = new nsCryptoRunnable(args);
|
||||||
|
@ -173,7 +173,7 @@ nsNSSSocketInfo::SetFirstWrite(PRBool aFirstWrite)
|
|||||||
nsresult
|
nsresult
|
||||||
nsNSSSocketInfo::SetHostName(const char* host)
|
nsNSSSocketInfo::SetHostName(const char* host)
|
||||||
{
|
{
|
||||||
mHostName.Adopt(nsCRT::strdup(host));
|
mHostName.Adopt(host ? nsCRT::strdup(host) : 0);
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -201,7 +201,7 @@ nsNSSSocketInfo::GetPort(PRInt32 *aPort)
|
|||||||
nsresult
|
nsresult
|
||||||
nsNSSSocketInfo::SetProxyHost(const char* aProxyHost)
|
nsNSSSocketInfo::SetProxyHost(const char* aProxyHost)
|
||||||
{
|
{
|
||||||
mProxyHostName.Adopt(nsCRT::strdup(aProxyHost));
|
mProxyHostName.Adopt(aProxyHost ? nsCRT::strdup(aProxyHost) : 0);
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user