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

Bug 316659: fix null dereference crash in markPageAsTyped, r=mano

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@184806 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
gavin%gavinsharp.com 2005-11-17 00:23:09 +00:00
parent 48d3f34dd8
commit c69143a44b
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/toolkit/components/history/src/nsGlobalHistory.cpp
View File

@ -1444,9 +1444,11 @@ nsGlobalHistory::HidePage(nsIURI *aURI)
NS_IMETHODIMP
nsGlobalHistory::MarkPageAsTyped(nsIURI *aURI)
{
NS_ENSURE_ARG_POINTER(aURI);
nsCAutoString spec;
nsresult rv = aURI->GetSpec(spec);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIMdbRow> row;
rv = FindRow(kToken_URLColumn, spec.get(), getter_AddRefs(row));
@ -1466,15 +1468,16 @@ nsGlobalHistory::MarkPageAsTyped(nsIURI *aURI)
NS_IMETHODIMP
nsGlobalHistory::SetURIGeckoFlags(nsIURI *aURI, PRUint32 aFlags)
{
NS_ENSURE_ARG_POINTER(aURI);
nsCAutoString spec;
nsresult rv = aURI->GetSpec(spec);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIMdbRow> row;
rv = FindRow(kToken_URLColumn, spec.get(), getter_AddRefs(row));
if (NS_FAILED(rv)) {
if (NS_FAILED(rv))
return rv;
}
return SetRowValue(row, kToken_GeckoFlagsColumn, (PRInt32)aFlags);
}
@ -1482,15 +1485,16 @@ nsGlobalHistory::SetURIGeckoFlags(nsIURI *aURI, PRUint32 aFlags)
NS_IMETHODIMP
nsGlobalHistory::GetURIGeckoFlags(nsIURI *aURI, PRUint32* aFlags)
{
NS_ENSURE_ARG_POINTER(aURI);
nsCAutoString spec;
nsresult rv = aURI->GetSpec(spec);
if (NS_FAILED(rv)) return rv;
if (NS_FAILED(rv))
return rv;
nsCOMPtr<nsIMdbRow> row;
rv = FindRow(kToken_URLColumn, spec.get(), getter_AddRefs(row));
if (NS_FAILED(rv)) {
if (NS_FAILED(rv))
return rv;
}
if (!HasCell(mEnv, row, kToken_GeckoFlagsColumn))
return NS_ERROR_FAILURE;