From 0bda8b661fdb821493e3acaa58a4aa9e8d5611ad Mon Sep 17 00:00:00 2001
From: "jfrancis%netscape.com" <jfrancis%netscape.com>
Date: Fri, 13 Oct 2000 01:02:57 +0000
Subject: [PATCH] trunk checkin of:  fix for rtm++ dogfood+ 55748; r=sfraser;
 sr=kin

---
 content/base/src/nsContentIterator.cpp | 2 +-
 layout/base/src/nsContentIterator.cpp  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/base/src/nsContentIterator.cpp b/content/base/src/nsContentIterator.cpp
index 206e6e554218..85a6a6ee6d12 100644
--- a/content/base/src/nsContentIterator.cpp
+++ b/content/base/src/nsContentIterator.cpp
@@ -896,7 +896,7 @@ nsresult nsContentSubtreeIterator::Init(nsIDOMRange* aRange)
   if (!firstCandidate)
   {
     // then firstCandidate is next node after cN
-    if (NS_FAILED(GetNextSibling(cN,  &firstCandidate)))
+    if (NS_FAILED(GetNextSibling(cN,  &firstCandidate)) || !firstCandidate)
     {
       MakeEmpty();
       return NS_OK;
diff --git a/layout/base/src/nsContentIterator.cpp b/layout/base/src/nsContentIterator.cpp
index 206e6e554218..85a6a6ee6d12 100644
--- a/layout/base/src/nsContentIterator.cpp
+++ b/layout/base/src/nsContentIterator.cpp
@@ -896,7 +896,7 @@ nsresult nsContentSubtreeIterator::Init(nsIDOMRange* aRange)
   if (!firstCandidate)
   {
     // then firstCandidate is next node after cN
-    if (NS_FAILED(GetNextSibling(cN,  &firstCandidate)))
+    if (NS_FAILED(GetNextSibling(cN,  &firstCandidate)) || !firstCandidate)
     {
       MakeEmpty();
       return NS_OK;