diff options
| author | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 14:25:18 +0000 |
|---|---|---|
| committer | vandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-17 14:25:18 +0000 |
| commit | 5c9eaa20a1444e5d38082d598f6737c777db586b (patch) | |
| tree | f5a5d728c014169137d6053bfb269c7cf5f3a133 /chrome/browser/extensions | |
| parent | 4e09c3f382b016f68dba992e5f65ebfb10638773 (diff) | |
| download | chromium_src-5c9eaa20a1444e5d38082d598f6737c777db586b.zip chromium_src-5c9eaa20a1444e5d38082d598f6737c777db586b.tar.gz chromium_src-5c9eaa20a1444e5d38082d598f6737c777db586b.tar.bz2 | |
Fix media galleries crash when the window is closed with config dialog open.
BUG=156165
TEST=Open the media galleries config dialog with a test extension and close the window with the config dialog open. The browser should not crash.
Review URL: https://chromiumcodereview.appspot.com/11196007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
| -rw-r--r-- | chrome/browser/extensions/api/media_galleries/media_galleries_api.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc index 1430964..98f89cc 100644 --- a/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc +++ b/chrome/browser/extensions/api/media_galleries/media_galleries_api.cc @@ -121,7 +121,12 @@ void MediaGalleriesGetMediaFileSystemsFunction::GetAndReturnGalleries() { void MediaGalleriesGetMediaFileSystemsFunction::ReturnGalleries( const std::vector<MediaFileSystemInfo>& filesystems) { - const int child_id = render_view_host()->GetProcess()->GetID(); + content::RenderViewHost* rvh = render_view_host(); + if (!rvh) { + SendResponse(false); + return; + } + const int child_id = rvh->GetProcess()->GetID(); std::set<std::string> file_system_names; base::ListValue* list = new base::ListValue(); for (size_t i = 0; i < filesystems.size(); i++) { |