corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1080709, null check files coming from filepicker's enumerator, r=baku

Browse Source
This commit is contained in:
Olli Pettay
2014-10-28 18:54:57 +02:00
parent 794088d50a
commit 11d88f2884
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dom/html/HTMLInputElement.cpp
View File

@@ -679,8 +679,11 @@ HTMLInputElement::nsFilePickerShownCallback::Done(int16_t aResult)
while (NS_SUCCEEDED(iter->HasMoreElements(&hasMore)) && hasMore) { while (NS_SUCCEEDED(iter->HasMoreElements(&hasMore)) && hasMore) {
iter->GetNext(getter_AddRefs(tmp)); iter->GetNext(getter_AddRefs(tmp));
nsCOMPtr<nsIDOMFile> domFile = do_QueryInterface(tmp); nsCOMPtr<nsIDOMFile> domFile = do_QueryInterface(tmp);
MOZ_ASSERT(domFile); NS_WARN_IF_FALSE(domFile,
newFiles.AppendElement(static_cast<File*>(domFile.get())); "Null file object from FilePicker's file enumerator?");
if (domFile) {
newFiles.AppendElement(static_cast<File*>(domFile.get()));
}
} }
} else { } else {
MOZ_ASSERT(mode == static_cast<int16_t>(nsIFilePicker::modeOpen)); MOZ_ASSERT(mode == static_cast<int16_t>(nsIFilePicker::modeOpen));