From 2f2abdfe8f12da76578d29cdb7b0f1067ce1cc3e Mon Sep 17 00:00:00 2001
From: "rods%netscape.com"
 <rods%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 23 Aug 1999 20:59:08 +0000
Subject: [PATCH] Fixes crash on start up of mail news

git-svn-id: svn://10.0.0.236/trunk@44162 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/layout/base/nsCSSFrameConstructor.cpp           | 2 +-
 mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mozilla/layout/base/nsCSSFrameConstructor.cpp b/mozilla/layout/base/nsCSSFrameConstructor.cpp
index c5e64c06fb7..d08a3481c99 100644
--- a/mozilla/layout/base/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/base/nsCSSFrameConstructor.cpp
@@ -4533,7 +4533,7 @@ nsCSSFrameConstructor::GetFrameFor(nsIPresShell*    aPresShell,
       nsIComboboxControlFrame * comboboxFrame;
       res = frame->QueryInterface(nsCOMTypeInfo<nsIComboboxControlFrame>::GetIID(),
                                                (void**)&comboboxFrame);
-      if (comboboxFrame) {
+      if (NS_SUCCEEDED(res) && comboboxFrame) {
         nsIFrame * listFrame;
         comboboxFrame->GetDropDown(&listFrame);
         if (nsnull != listFrame) {
diff --git a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
index c5e64c06fb7..d08a3481c99 100644
--- a/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
+++ b/mozilla/layout/html/style/src/nsCSSFrameConstructor.cpp
@@ -4533,7 +4533,7 @@ nsCSSFrameConstructor::GetFrameFor(nsIPresShell*    aPresShell,
       nsIComboboxControlFrame * comboboxFrame;
       res = frame->QueryInterface(nsCOMTypeInfo<nsIComboboxControlFrame>::GetIID(),
                                                (void**)&comboboxFrame);
-      if (comboboxFrame) {
+      if (NS_SUCCEEDED(res) && comboboxFrame) {
         nsIFrame * listFrame;
         comboboxFrame->GetDropDown(&listFrame);
         if (nsnull != listFrame) {