From 9f5529d1e7374ee3ed186958c8cf192e88b7405d Mon Sep 17 00:00:00 2001
From: wolfbeast <mcwerewolf@wolfbeast.com>
Date: Mon, 13 Apr 2020 12:55:47 +0200
Subject: Issue #1513 - Bail on orphan node

This was refactored by Mozilla into doing effectively the same thing so
it aligns with them re: behavior.
Resolves #1513
---
 editor/libeditor/HTMLEditRules.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'editor/libeditor')

diff --git a/editor/libeditor/HTMLEditRules.cpp b/editor/libeditor/HTMLEditRules.cpp
index c2d61f767..545e22f70 100644
--- a/editor/libeditor/HTMLEditRules.cpp
+++ b/editor/libeditor/HTMLEditRules.cpp
@@ -4641,7 +4641,11 @@ HTMLEditRules::WillAlign(Selection& aSelection,
     }
 
     nsCOMPtr<nsINode> curParent = curNode->GetParentNode();
-    int32_t offset = curParent ? curParent->IndexOf(curNode) : -1;
+    if (!curParent) {
+      continue;
+    }
+
+    int32_t offset = curParent->IndexOf(curNode);
 
     // Skip insignificant formatting text nodes to prevent unnecessary
     // structure splitting!
-- 
cgit v1.2.3