From 6aaab6c6ffd9de1c671ff1831afe30ffbe58cefc Mon Sep 17 00:00:00 2001 From: "jruderman%hmc.edu" Date: Sat, 15 Dec 2007 18:51:50 +0000 Subject: [PATCH] Fix off-by-one error (bug 408431). r=dcamp, sr=jst, a=jst git-svn-id: svn://10.0.0.236/trunk@241355 18797224-902f-48f8-a5cc-f745e15eee43 --- .../dom/src/offline/crashtests/408431-1.html | 25 +++++++++++++++++++ .../src/offline/crashtests/crashtests.list | 1 + .../offline/nsDOMOfflineLoadStatusList.cpp | 3 +-- mozilla/testing/crashtest/crashtests.list | 1 + 4 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 mozilla/dom/src/offline/crashtests/408431-1.html create mode 100644 mozilla/dom/src/offline/crashtests/crashtests.list diff --git a/mozilla/dom/src/offline/crashtests/408431-1.html b/mozilla/dom/src/offline/crashtests/408431-1.html new file mode 100644 index 00000000000..14bb2203f15 --- /dev/null +++ b/mozilla/dom/src/offline/crashtests/408431-1.html @@ -0,0 +1,25 @@ + + + + + + + + diff --git a/mozilla/dom/src/offline/crashtests/crashtests.list b/mozilla/dom/src/offline/crashtests/crashtests.list new file mode 100644 index 00000000000..a185168c263 --- /dev/null +++ b/mozilla/dom/src/offline/crashtests/crashtests.list @@ -0,0 +1 @@ +load 408431-1.html diff --git a/mozilla/dom/src/offline/nsDOMOfflineLoadStatusList.cpp b/mozilla/dom/src/offline/nsDOMOfflineLoadStatusList.cpp index 590c23d94d3..edc5c14070b 100644 --- a/mozilla/dom/src/offline/nsDOMOfflineLoadStatusList.cpp +++ b/mozilla/dom/src/offline/nsDOMOfflineLoadStatusList.cpp @@ -322,7 +322,7 @@ nsDOMOfflineLoadStatusList::Item(PRUint32 aItem, nsIDOMLoadStatus **aStatus) nsresult rv = Init(); NS_ENSURE_SUCCESS(rv, rv); - if ((PRInt32)aItem > mItems.Count()) return NS_ERROR_DOM_INDEX_SIZE_ERR; + if ((PRInt32)aItem >= mItems.Count()) return NS_ERROR_DOM_INDEX_SIZE_ERR; NS_ADDREF(*aStatus = mItems[aItem]); @@ -497,7 +497,6 @@ nsDOMOfflineLoadStatusList::Observe(nsISupports *aSubject, const char *aTopic, const PRUnichar *aData) { - nsresult rv; if (!strcmp(aTopic, "offline-cache-update-added")) { nsCOMPtr update = do_QueryInterface(aSubject); if (update) { diff --git a/mozilla/testing/crashtest/crashtests.list b/mozilla/testing/crashtest/crashtests.list index 9e82cd572c2..654bd7b0dbe 100644 --- a/mozilla/testing/crashtest/crashtests.list +++ b/mozilla/testing/crashtest/crashtests.list @@ -13,6 +13,7 @@ include ../../content/xul/content/crashtests/crashtests.list include ../../docshell/base/crashtests/crashtests.list include ../../dom/src/base/crashtests/crashtests.list +include ../../dom/src/offline/crashtests/crashtests.list include ../../editor/libeditor/html/crashtests/crashtests.list