From bd00f336c3798f708be46a482e7da034b2524aed Mon Sep 17 00:00:00 2001
From: "bzbarsky%mit.edu" <bzbarsky%mit.edu>
Date: Thu, 8 Aug 2002 22:27:57 +0000
Subject: [PATCH] Fix crash when clicking empty space in <select>.  Bug 161499,
 r=jkeiser, sr=jst

---
 layout/forms/nsListControlFrame.cpp          | 11 +++++++----
 layout/html/forms/src/nsListControlFrame.cpp | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/layout/forms/nsListControlFrame.cpp b/layout/forms/nsListControlFrame.cpp
index dcaca1e1c8d2..ed121951bd86 100644
--- a/layout/forms/nsListControlFrame.cpp
+++ b/layout/forms/nsListControlFrame.cpp
@@ -658,10 +658,13 @@ void nsListControlFrame::PaintFocus(nsIRenderingContext& aRC, nsFramePaintLayer
   }
 
   PRBool lastItemIsSelected = PR_FALSE;
-  nsCOMPtr<nsIDOMNode> node;
-  if (NS_SUCCEEDED(selectNSElement->Item(focusedIndex, getter_AddRefs(node)))) {
-    nsCOMPtr<nsIDOMHTMLOptionElement> domOpt(do_QueryInterface(node));
-    domOpt->GetSelected(&lastItemIsSelected);
+  if (focusedIndex != kNothingSelected) {
+    nsCOMPtr<nsIDOMNode> node;
+    if (NS_SUCCEEDED(selectNSElement->Item(focusedIndex, getter_AddRefs(node)))) {
+      nsCOMPtr<nsIDOMHTMLOptionElement> domOpt(do_QueryInterface(node));
+      NS_ASSERTION(domOpt, "Something has gone seriously awry.  This should be an option element!");
+      domOpt->GetSelected(&lastItemIsSelected);
+    }
   }
 
   // set up back stop colors and then ask L&F service for the real colors
diff --git a/layout/html/forms/src/nsListControlFrame.cpp b/layout/html/forms/src/nsListControlFrame.cpp
index dcaca1e1c8d2..ed121951bd86 100644
--- a/layout/html/forms/src/nsListControlFrame.cpp
+++ b/layout/html/forms/src/nsListControlFrame.cpp
@@ -658,10 +658,13 @@ void nsListControlFrame::PaintFocus(nsIRenderingContext& aRC, nsFramePaintLayer
   }
 
   PRBool lastItemIsSelected = PR_FALSE;
-  nsCOMPtr<nsIDOMNode> node;
-  if (NS_SUCCEEDED(selectNSElement->Item(focusedIndex, getter_AddRefs(node)))) {
-    nsCOMPtr<nsIDOMHTMLOptionElement> domOpt(do_QueryInterface(node));
-    domOpt->GetSelected(&lastItemIsSelected);
+  if (focusedIndex != kNothingSelected) {
+    nsCOMPtr<nsIDOMNode> node;
+    if (NS_SUCCEEDED(selectNSElement->Item(focusedIndex, getter_AddRefs(node)))) {
+      nsCOMPtr<nsIDOMHTMLOptionElement> domOpt(do_QueryInterface(node));
+      NS_ASSERTION(domOpt, "Something has gone seriously awry.  This should be an option element!");
+      domOpt->GetSelected(&lastItemIsSelected);
+    }
   }
 
   // set up back stop colors and then ask L&F service for the real colors