From 49230cedc67e82ede1b41c7eb514f2d2a8647b17 Mon Sep 17 00:00:00 2001
From: Shane Caraveo <scaraveo@mozilla.com>
Date: Fri, 6 Oct 2017 16:58:15 -0700
Subject: [PATCH] Bug 1406229 fix autocomplete crash in panels when window is
 closed during event, r=mak

MozReview-Commit-ID: 6TrLuwrk2nD

--HG--
extra : rebase_source : dc6f3dcc13a7fd5063290fdf394d9e7c325441de
---
 .../components/autocomplete/nsAutoCompleteController.cpp   | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/toolkit/components/autocomplete/nsAutoCompleteController.cpp b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
index 3876380201f6..ba5287f1fabd 100644
--- a/toolkit/components/autocomplete/nsAutoCompleteController.cpp
+++ b/toolkit/components/autocomplete/nsAutoCompleteController.cpp
@@ -367,6 +367,13 @@ nsAutoCompleteController::HandleEnter(bool aIsPopupSelection,
 
   // Stop the search, and handle the enter.
   StopSearch();
+  // StopSearch() can call PostSearchCleanup() which might result
+  // in a blur event, which could null out mInput, so we need to check it
+  // again.  See bug #408463 for more details
+  if (!mInput) {
+    return NS_OK;
+  }
+
   EnterMatch(aIsPopupSelection, aEvent);
 
   return NS_OK;