Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 86885 crash if cookie service not available, c=waterson, r=morse, sr=scc, a=chofmann

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@97905 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
morse%netscape.com
2001-06-26 00:11:04 +00:00
parent 7546bc3f82
commit 89cb681ffa
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -1967,19 +1967,16 @@ nsHTMLDocument::GetCookie(nsAWritableString& aCookie)
{
nsresult result = NS_OK;
nsAutoString str;
NS_WITH_SERVICE(nsICookieService, service, kCookieServiceCID, &result);
char * cookie;
if ((NS_OK == result) && (nsnull != service) && (nsnull != mDocumentURL)) {
result = service->GetCookieString(mDocumentURL, &cookie);
aCookie.Truncate(); // clear current cookie in case service fails; no cookie isn't an error condition.
nsCOMPtr<nsICookieService> service = do_GetService(kCookieServiceCID, &result);
if (NS_SUCCEEDED(result) && service && mDocumentURL) {
nsXPIDLCString cookie;
result = service->GetCookieString(mDocumentURL, getter_Copies(cookie));
if (NS_SUCCEEDED(result) && cookie)
CopyASCIItoUCS2(nsDependentCString(cookie), aCookie);
}
if (nsnull != cookie) {
str.AssignWithConversion(cookie);
nsCRT::free(cookie);
} else {
// No Cookie isn't an error condition.
aCookie.Truncate();
}
aCookie.Assign(str);
return result;
}
@@ -1987,9 +1984,8 @@ NS_IMETHODIMP
nsHTMLDocument::SetCookie(const nsAReadableString& aCookie)
{
nsresult result = NS_OK;
NS_WITH_SERVICE(nsICookieService, service, kCookieServiceCID, &result);
if ((NS_OK == result) && (nsnull != service) && (nsnull != mDocumentURL)) {
char *cookie = nsString(aCookie).ToNewCString();
nsCOMPtr<nsICookieService> service = do_GetService(kCookieServiceCID, &result);
if (NS_SUCCEEDED(result) && service && mDocumentURL) {
nsCOMPtr<nsIScriptGlobalObject> globalObj;
nsCOMPtr<nsIPrompt> prompt;
this->GetScriptGlobalObject(getter_AddRefs(globalObj));
@@ -1999,8 +1995,12 @@ nsHTMLDocument::SetCookie(const nsAReadableString& aCookie)
window->GetPrompter(getter_AddRefs(prompt));
}
}
result = service->SetCookieString(mDocumentURL, prompt, cookie);
nsCRT::free(cookie);
result = NS_ERROR_OUT_OF_MEMORY;
char* cookie = ToNewCString(aCookie);
if (cookie) {
result = service->SetCookieString(mDocumentURL, prompt, cookie);
nsCRT::free(cookie);
}
}
return result;
}