Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1513332, add some null-pointer checks on elements in XULListboxAccessible, r=marcoz

Browse Source
This commit is contained in:
Neil Deakin 2018-12-17 20:02:11 -05:00
parent 631a33d252
commit 0e5b436454
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
accessible/xul/XULListboxAccessible.cpp
View File

@ -111,9 +111,13 @@ void XULListboxAccessible::Value(nsString& aValue) const {
RefPtr<Element> element;
select->GetSelectedItem(getter_AddRefs(element));
nsCOMPtr<nsIDOMXULSelectControlItemElement> selectedItem =
element->AsXULSelectControlItem();
if (selectedItem) selectedItem->GetLabel(aValue);
if (element) {
nsCOMPtr<nsIDOMXULSelectControlItemElement> selectedItem =
element->AsXULSelectControlItem();
if (selectedItem) {
selectedItem->GetLabel(aValue);
}
}
}
}
@ -176,6 +180,9 @@ bool XULListboxAccessible::IsRowSelected(uint32_t aRowIdx) {
RefPtr<Element> element;
nsresult rv = control->GetItemAtIndex(aRowIdx, getter_AddRefs(element));
NS_ENSURE_SUCCESS(rv, false);
if (!element) {
return false;
}
nsCOMPtr<nsIDOMXULSelectControlItemElement> item =
element->AsXULSelectControlItem();
@ -337,6 +344,9 @@ void XULListboxAccessible::SelectRow(uint32_t aRowIdx) {
RefPtr<Element> item;
control->GetItemAtIndex(aRowIdx, getter_AddRefs(item));
if (!item) {
return;
}
nsCOMPtr<nsIDOMXULSelectControlItemElement> itemElm =
item->AsXULSelectControlItem();
@ -351,6 +361,9 @@ void XULListboxAccessible::UnselectRow(uint32_t aRowIdx) {
RefPtr<Element> item;
control->GetItemAtIndex(aRowIdx, getter_AddRefs(item));
if (!item) {
return;
}
nsCOMPtr<nsIDOMXULSelectControlItemElement> itemElm =
item->AsXULSelectControlItem();