From 83ef4246aaa4260861439af7e5bad18da63d6866 Mon Sep 17 00:00:00 2001 From: "rods%netscape.com" Date: Tue, 4 Jun 2002 12:06:59 +0000 Subject: [PATCH] Check for null dom content before doing QI Bug 148760 r=jkesier sr=jst git-svn-id: svn://10.0.0.236/trunk@122673 18797224-902f-48f8-a5cc-f745e15eee43 --- .../content/html/content/src/nsHTMLLabelElement.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp index e615c027746..d0f614a23ce 100644 --- a/mozilla/content/html/content/src/nsHTMLLabelElement.cpp +++ b/mozilla/content/html/content/src/nsHTMLLabelElement.cpp @@ -514,10 +514,12 @@ nsHTMLLabelElement::GetForContent() if (domDoc) { nsCOMPtr domElement; domDoc->GetElementById(elementId, getter_AddRefs(domElement)); - nsIContent *result; - CallQueryInterface(domElement, &result); - if (result && !result->IsContentOfType(nsIContent::eHTML_FORM_CONTROL)) { - NS_RELEASE(result); // assigns null + nsIContent *result = nsnull; + if (domElement) { + CallQueryInterface(domElement, &result); + if (result && !result->IsContentOfType(nsIContent::eHTML_FORM_CONTROL)) { + NS_RELEASE(result); // assigns null + } } return result; }