Reviewed by Darin.

        Fixes <http://bugzilla.opendarwin.org/show_bug.cgi?id=10159>
        "REGRESSION: delegate returning no menu elements crashes webkit"

        No automated test, because there's no way to programmatically open a context menu,
        no manual test because there's no way to customize the context menu delegate.

        * WebView/WebView.m:
        (-[WebView _menuForElement:defaultItems:]): Make sure the context menu returned
        some menu items before accessing the first one.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@15726 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 32dd569c2d71449f9306430fe3e32569abc436cd..926883d8237d0965df7a1be7f3f3f03e92ed5d8d 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2006-07-31  Duncan Wilcox  <duncan@mclink.it>
+
+        Reviewed by Darin.
+
+        Fixes <http://bugzilla.opendarwin.org/show_bug.cgi?id=10159>
+        "REGRESSION: delegate returning no menu elements crashes webkit"
+
+        No automated test, because there's no way to programmatically open a context menu,
+        no manual test because there's no way to customize the context menu delegate.
+
+        * WebView/WebView.m:
+        (-[WebView _menuForElement:defaultItems:]): Make sure the context menu returned
+        some menu items before accessing the first one.
+
 2006-07-31  Timothy Hatcher  <timothy@apple.com>
 
         Reviewed by John.

diff --git a/WebKit/WebView/WebView.m b/WebKit/WebView/WebView.m
index 52698e5e92b63cf2da6dc34b8aa171d306a3a10a..fd2c29eae7d90a14bf4f29b1830b6654aa706cf4 100644 (file)
--- a/WebKit/WebView/WebView.m
+++ b/WebKit/WebView/WebView.m
@@ -721,7 +721,7 @@ static bool debugWidget = true;
             // items. This shouldn't affect any clients other than Mail since the tags for the three items
             // were not public API. We can remove this code when we no longer support previously-built versions
             // of Mail on Tiger. See 4498606 for more details.
-            if (([[defaultMenuItems objectAtIndex:0] tag] == WebMenuItemTagSearchInSpotlight) && ([[menuItems objectAtIndex:0] isSeparatorItem])) {
+            if ([menuItems count] && ([[defaultMenuItems objectAtIndex:0] tag] == WebMenuItemTagSearchInSpotlight) && ([[menuItems objectAtIndex:0] isSeparatorItem])) {
                 ASSERT([[menuItems objectAtIndex:1] isSeparatorItem]);
                 ASSERT([[defaultMenuItems objectAtIndex:1] tag] == WebMenuItemTagSearchWeb);
                 ASSERT([[defaultMenuItems objectAtIndex:2] isSeparatorItem]);