Bug 1166742 - nsFilePickerProxy::SimpleEnumerator should return false when HasMoreElements is called on an empty array, r=smaug

2015-05-20 16:18:47 +01:00
parent 1b0758e03e
commit 203f72b832
1 changed files with 3 additions and 1 deletions
--- a/widget/nsFilePickerProxy.cpp
+++ b/widget/nsFilePickerProxy.cpp
@@ -207,13 +207,15 @@ public:
  HasMoreElements(bool* aRetvalue) override
  {
    MOZ_ASSERT(aRetvalue);
-    *aRetvalue = mFiles.Length() >= mIndex;
+    *aRetvalue = mIndex < mFiles.Length();
    return NS_OK;
  }

  NS_IMETHOD
  GetNext(nsISupports** aSupports) override
  {
+    NS_ENSURE_TRUE(mIndex < mFiles.Length(), NS_ERROR_FAILURE);
+
    nsCOMPtr<nsIDOMBlob> blob = mFiles[mIndex++].get();
    blob.forget(aSupports);
    return NS_OK;