зеркало из https://github.com/mozilla/pjs.git
Added asserts to check for null pointers being passed in from JS.
This commit is contained in:
Родитель
41381a07dc
Коммит
cee98def18
|
@ -483,6 +483,10 @@ nsBrowserAppCore::LoadUrl(const nsString& aUrl)
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsBrowserAppCore::SetToolbarWindow(nsIDOMWindow* aWin)
|
nsBrowserAppCore::SetToolbarWindow(nsIDOMWindow* aWin)
|
||||||
{
|
{
|
||||||
|
NS_PRECONDITION(aWin != nsnull, "null ptr");
|
||||||
|
if (! aWin)
|
||||||
|
return NS_ERROR_NULL_POINTER;
|
||||||
|
|
||||||
mToolbarWindow = aWin;
|
mToolbarWindow = aWin;
|
||||||
NS_ADDREF(aWin);
|
NS_ADDREF(aWin);
|
||||||
mToolbarScriptContext = GetScriptContext(aWin);
|
mToolbarScriptContext = GetScriptContext(aWin);
|
||||||
|
@ -493,6 +497,10 @@ nsBrowserAppCore::SetToolbarWindow(nsIDOMWindow* aWin)
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsBrowserAppCore::SetContentWindow(nsIDOMWindow* aWin)
|
nsBrowserAppCore::SetContentWindow(nsIDOMWindow* aWin)
|
||||||
{
|
{
|
||||||
|
NS_PRECONDITION(aWin != nsnull, "null ptr");
|
||||||
|
if (! aWin)
|
||||||
|
return NS_ERROR_NULL_POINTER;
|
||||||
|
|
||||||
mContentWindow = aWin;
|
mContentWindow = aWin;
|
||||||
|
|
||||||
NS_ADDREF(aWin);
|
NS_ADDREF(aWin);
|
||||||
|
@ -530,6 +538,10 @@ nsBrowserAppCore::SetContentWindow(nsIDOMWindow* aWin)
|
||||||
NS_IMETHODIMP
|
NS_IMETHODIMP
|
||||||
nsBrowserAppCore::SetWebShellWindow(nsIDOMWindow* aWin)
|
nsBrowserAppCore::SetWebShellWindow(nsIDOMWindow* aWin)
|
||||||
{
|
{
|
||||||
|
NS_PRECONDITION(aWin != nsnull, "null ptr");
|
||||||
|
if (! aWin)
|
||||||
|
return NS_ERROR_NULL_POINTER;
|
||||||
|
|
||||||
if (!mContentWindow) {
|
if (!mContentWindow) {
|
||||||
return NS_ERROR_FAILURE;
|
return NS_ERROR_FAILURE;
|
||||||
}
|
}
|
||||||
|
|
Загрузка…
Ссылка в новой задаче