diff options
| author | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 00:11:21 +0000 |
|---|---|---|
| committer | ananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-02 00:11:21 +0000 |
| commit | 6818e708dfd58aee620d592df28b29c251dcb0f1 (patch) | |
| tree | f2892cb1b0a3165ff51a98db42cdc16465134757 /chrome/browser/browser_accessibility_manager_win.cc | |
| parent | 967c21d7ba1a0c24574259274f8d571fa1db84c1 (diff) | |
| download | chromium_src-6818e708dfd58aee620d592df28b29c251dcb0f1.zip chromium_src-6818e708dfd58aee620d592df28b29c251dcb0f1.tar.gz chromium_src-6818e708dfd58aee620d592df28b29c251dcb0f1.tar.bz2 | |
Fix a chrome browser crash which occurs when launched as part of chrome frame while processing
the ViewHostMsg_AccessibilityObjectChildrenChange message. The crash occurs because we fail to
find the BrowserAccessibility interface for the child id passed in.
Fix is to NULL check the same.
Bug=54142
Review URL: http://codereview.chromium.org/3295005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_accessibility_manager_win.cc')
| -rw-r--r-- | chrome/browser/browser_accessibility_manager_win.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/browser_accessibility_manager_win.cc b/chrome/browser/browser_accessibility_manager_win.cc index dd2f397..85066ab 100644 --- a/chrome/browser/browser_accessibility_manager_win.cc +++ b/chrome/browser/browser_accessibility_manager_win.cc @@ -158,6 +158,8 @@ BrowserAccessibility* BrowserAccessibilityManager::UpdateTree( LONG child_id = iter->second; BrowserAccessibility* old_browser_acc = GetFromChildID(child_id); + if (!old_browser_acc) + return NULL; if (old_browser_acc->GetChildCount() == 0 && acc_obj.children.size() == 0) { // Reinitialize the BrowserAccessibility if there are no children to update. |