From e0d4fbd3b8462137170bfdacfa1b4c8bf44b01f7 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Fri, 15 Jan 2010 12:17:48 -0500
Subject: [PATCH] Bug 537046 - crash in [@ nsWSRunObject::GetWSBoundingParent()
 ]; r=peterv

--HG--
extra : rebase_source : 69b6a49317b33794a904f7b1e8e63a5dea43792b
---
 editor/libeditor/html/nsWSRunObject.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/editor/libeditor/html/nsWSRunObject.cpp b/editor/libeditor/html/nsWSRunObject.cpp
index 1a732b87d555..6e7c7fad44e2 100644
--- a/editor/libeditor/html/nsWSRunObject.cpp
+++ b/editor/libeditor/html/nsWSRunObject.cpp
@@ -694,6 +694,8 @@ nsWSRunObject::AdjustWhitespace()
 already_AddRefed<nsIDOMNode>
 nsWSRunObject::GetWSBoundingParent()
 {
+  if (!mNode)
+    return nsnull;
   nsCOMPtr<nsIDOMNode> wsBoundingParent = mNode;
   while (!IsBlockNode(wsBoundingParent))
   {