From 5cdb033229c78aa1408f49667ec686586ef134c6 Mon Sep 17 00:00:00 2001 From: "rjc%netscape.com" Date: Thu, 6 May 1999 00:38:54 +0000 Subject: [PATCH] Add some small NULL checks. git-svn-id: svn://10.0.0.236/trunk@30472 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/xul/templates/src/nsXULSortService.cpp | 4 ++-- mozilla/rdf/content/src/nsXULSortService.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/mozilla/content/xul/templates/src/nsXULSortService.cpp b/mozilla/content/xul/templates/src/nsXULSortService.cpp index 9316d62c5a5..e6f31cfc212 100644 --- a/mozilla/content/xul/templates/src/nsXULSortService.cpp +++ b/mozilla/content/xul/templates/src/nsXULSortService.cpp @@ -684,9 +684,9 @@ getNodeValue(nsIContent *node1, nsIRDFResource *sortProperty, sortPtr sortInfo, nsresult rv; cellVal1 = ""; - if (NS_SUCCEEDED(rv = node1->QueryInterface(kIDomXulElementIID, (void **)&dom1))) + if (NS_SUCCEEDED(rv = node1->QueryInterface(kIDomXulElementIID, (void **)&dom1)) && (nsnull != dom1)) { - if (NS_SUCCEEDED(rv = dom1->GetResource(&res1))) + if (NS_SUCCEEDED(rv = dom1->GetResource(&res1)) && (nsnull != res1)) { if ((sortInfo->naturalOrderSort == PR_FALSE) && (sortInfo->sortProperty)) { diff --git a/mozilla/rdf/content/src/nsXULSortService.cpp b/mozilla/rdf/content/src/nsXULSortService.cpp index 9316d62c5a5..e6f31cfc212 100644 --- a/mozilla/rdf/content/src/nsXULSortService.cpp +++ b/mozilla/rdf/content/src/nsXULSortService.cpp @@ -684,9 +684,9 @@ getNodeValue(nsIContent *node1, nsIRDFResource *sortProperty, sortPtr sortInfo, nsresult rv; cellVal1 = ""; - if (NS_SUCCEEDED(rv = node1->QueryInterface(kIDomXulElementIID, (void **)&dom1))) + if (NS_SUCCEEDED(rv = node1->QueryInterface(kIDomXulElementIID, (void **)&dom1)) && (nsnull != dom1)) { - if (NS_SUCCEEDED(rv = dom1->GetResource(&res1))) + if (NS_SUCCEEDED(rv = dom1->GetResource(&res1)) && (nsnull != res1)) { if ((sortInfo->naturalOrderSort == PR_FALSE) && (sortInfo->sortProperty)) {