зеркало из https://github.com/mozilla/gecko-dev.git
Bug 91594 Consistent crash for me when trying to add address card, r=ducarroz, sr=mscott
This commit is contained in:
Родитель
5627dc3547
Коммит
b201cef7d7
|
@ -625,7 +625,7 @@ NS_IMETHODIMP nsAbMDBDirectory::AddMailList(nsIAbDirectory *list)
|
|||
if (!mDatabase)
|
||||
rv = GetAbDatabase();
|
||||
|
||||
if (!(NS_SUCCEEDED(rv) || mDatabase))
|
||||
if (NS_FAILED(rv) || !mDatabase)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
nsCOMPtr<nsIAbMDBDirectory> dblist(do_QueryInterface(list, &rv));
|
||||
|
@ -670,7 +670,7 @@ NS_IMETHODIMP nsAbMDBDirectory::AddCard(nsIAbCard* card, nsIAbCard **_retval)
|
|||
if (!mDatabase)
|
||||
rv = GetAbDatabase();
|
||||
|
||||
if (!(NS_SUCCEEDED(rv) || mDatabase))
|
||||
if (NS_FAILED(rv) || !mDatabase)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
nsCOMPtr<nsIAbMDBCard> dbcard(do_QueryInterface(card, &rv));
|
||||
|
@ -729,7 +729,7 @@ NS_IMETHODIMP nsAbMDBDirectory::DropCard(nsIAbCard* card, nsIAbCard **_retval)
|
|||
if (!mDatabase)
|
||||
rv = GetAbDatabase();
|
||||
|
||||
if (!(NS_SUCCEEDED(rv) || mDatabase))
|
||||
if (NS_FAILED(rv) || !mDatabase)
|
||||
return NS_ERROR_FAILURE;
|
||||
|
||||
nsCOMPtr<nsIAbMDBCard> dbcard(do_QueryInterface(card, &rv));
|
||||
|
|
|
@ -105,9 +105,7 @@ nsresult nsAbMDBRDFResource::GetAbDatabase()
|
|||
if (mDatabase)
|
||||
mDatabase->AddListener(this);
|
||||
|
||||
delete dbPath;
|
||||
|
||||
return NS_OK;
|
||||
delete dbPath;
|
||||
}
|
||||
if (!mDatabase)
|
||||
return NS_ERROR_NULL_POINTER;
|
||||
|
|
Загрузка…
Ссылка в новой задаче