From 2c5d76fa0eebed6062c7ffcaeea17adf53a7b5cb Mon Sep 17 00:00:00 2001
From: ramiro <ramiro@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 21 Apr 1998 14:55:16 +0000
Subject: [PATCH] Handle bogus input for XfeCascadeGetSubMenu().

git-svn-id: svn://10.0.0.236/trunk@451 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/cmd/xfe/XfeWidgets/Xfe/MenuUtil.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/mozilla/cmd/xfe/XfeWidgets/Xfe/MenuUtil.c b/mozilla/cmd/xfe/XfeWidgets/Xfe/MenuUtil.c
index e2f162d9013..5b7c2abb33f 100644
--- a/mozilla/cmd/xfe/XfeWidgets/Xfe/MenuUtil.c
+++ b/mozilla/cmd/xfe/XfeWidgets/Xfe/MenuUtil.c
@@ -46,9 +46,13 @@
 XfeCascadeGetSubMenu(Widget w)
 {
     assert( w != NULL );
-    assert( (XmIsCascadeButton(w) || 
-			 XmIsCascadeButtonGadget(w) || 
-			 XfeIsCascade(w)) );
+
+    if (!XmIsCascadeButton(w) || 
+        !XmIsCascadeButtonGadget(w) || 
+        !XfeIsCascade(w))
+    {
+      return NULL;
+    }
 
 	if (XmIsCascadeButton(w))
 	{