From 463ab72594649433af1b2d7f6d5fd3601043220a Mon Sep 17 00:00:00 2001 From: "martijn.martijn%gmail.com" Date: Tue, 24 Feb 2009 15:15:24 +0000 Subject: [PATCH] Bug 450876 - Crash [@ nsEventStateManager::GetNextTabbableMapArea] with img usemap and tabindex, r=Olli.Pettay, sr=roc, sr=dveditz (for 1.9.0.x), a=dveditz git-svn-id: svn://10.0.0.236/trunk@256309 18797224-902f-48f8-a5cc-f745e15eee43 --- .../events/src/nsEventStateManager.cpp | 2 + mozilla/content/events/test/Makefile.in | 1 + .../content/events/test/test_bug450876.html | 43 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 mozilla/content/events/test/test_bug450876.html diff --git a/mozilla/content/events/src/nsEventStateManager.cpp b/mozilla/content/events/src/nsEventStateManager.cpp index ec2773c9335..e5ba85ba0b3 100644 --- a/mozilla/content/events/src/nsEventStateManager.cpp +++ b/mozilla/content/events/src/nsEventStateManager.cpp @@ -3949,6 +3949,8 @@ nsEventStateManager::GetNextTabbableMapArea(PRBool aForward, nsCOMPtr doc = aImageContent->GetDocument(); if (doc) { nsCOMPtr imageMap = nsImageMapUtils::FindImageMap(doc, useMap); + if (!imageMap) + return nsnull; nsCOMPtr mapContent = do_QueryInterface(imageMap); PRUint32 count = mapContent->GetChildCount(); // First see if mCurrentFocus is in this map diff --git a/mozilla/content/events/test/Makefile.in b/mozilla/content/events/test/Makefile.in index 1f9647683e5..5d54ae3d24a 100644 --- a/mozilla/content/events/test/Makefile.in +++ b/mozilla/content/events/test/Makefile.in @@ -58,6 +58,7 @@ _TEST_FILES = \ test_bug402089.html \ test_bug405632.html \ test_bug409604.html \ + test_bug450876.html \ $(NULL) _CHROME_FILES = \ diff --git a/mozilla/content/events/test/test_bug450876.html b/mozilla/content/events/test/test_bug450876.html new file mode 100644 index 00000000000..d0392122059 --- /dev/null +++ b/mozilla/content/events/test/test_bug450876.html @@ -0,0 +1,43 @@ + + + + Test for Bug 450876 - Crash [@ nsEventStateManager::GetNextTabbableMapArea] with img usemap and tabindex + + + + + +Mozilla Bug 450876 +

link to focus from

+ + +
+
+
+ + +