Chromium Code Reviews| Index: ui/views/accessibility/native_view_accessibility_win.cc |
| diff --git a/ui/views/accessibility/native_view_accessibility_win.cc b/ui/views/accessibility/native_view_accessibility_win.cc |
| index 8dddc3c30c13993f48bd3f3dcebc09ffddcab6b4..1e533d9939a2959d017f1e734b61c30ba51cbece 100644 |
| --- a/ui/views/accessibility/native_view_accessibility_win.cc |
| +++ b/ui/views/accessibility/native_view_accessibility_win.cc |
| @@ -790,6 +790,12 @@ STDMETHODIMP NativeViewAccessibilityWin::accSelect( |
| STDMETHODIMP NativeViewAccessibilityWin::get_accHelp( |
| VARIANT var_id, BSTR* help) { |
| + if (!IsValidId(var_id) || !help) |
| + return E_INVALIDARG; |
| + |
| + if (!view_) |
| + return E_FAIL; |
| + |
| base::string16 temp = base::UTF8ToUTF16(view_->GetClassName()); |
| *help = SysAllocString(temp.c_str()); |
| return S_OK; |
| @@ -1183,6 +1189,12 @@ STDMETHODIMP NativeViewAccessibilityWin::QueryService( |
| STDMETHODIMP NativeViewAccessibilityWin::GetPatternProvider( |
| PATTERNID id, IUnknown** provider) { |
| + if (!view_) |
| + return E_FAIL; |
| + |
| + if (!provider) |
| + return E_INVALIDARG; |
| + |
| DVLOG(1) << "In Function: " |
| << __FUNCTION__ |
| << " for pattern id: " |
| @@ -1204,6 +1216,12 @@ STDMETHODIMP NativeViewAccessibilityWin::GetPatternProvider( |
| STDMETHODIMP NativeViewAccessibilityWin::GetPropertyValue(PROPERTYID id, |
| VARIANT* ret) { |
| + if (!view_) |
| + return E_FAIL; |
| + |
| + if (!provider) |
|
ananta
2015/01/28 21:32:37
Incorrect check? No provider here,
dmazzoni
2015/01/28 21:47:22
Oops, this should be |ret|. Compiles now.
|
| + return E_INVALIDARG; |
| + |
| DVLOG(1) << "In Function: " |
| << __FUNCTION__ |
| << " for property id: " |