Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(123)

Unified Diff: content/browser/plugin_loader_posix.cc

Issue 9349002: Merge 120098 - PluginLoaderPosix: Fix the case where the utility process crashes after all plugin... (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1025/src/
Patch Set: Created 8 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | content/browser/plugin_loader_posix_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/plugin_loader_posix.cc
===================================================================
--- content/browser/plugin_loader_posix.cc (revision 120641)
+++ content/browser/plugin_loader_posix.cc (working copy)
@@ -44,8 +44,14 @@
}
void PluginLoaderPosix::OnProcessCrashed(int exit_code) {
- canonical_list_.erase(canonical_list_.begin(),
- canonical_list_.begin() + next_load_index_ + 1);
+ if (next_load_index_ == canonical_list_.size()) {
+ // How this case occurs is unknown. See crbug.com/111935.
+ canonical_list_.clear();
+ } else {
+ canonical_list_.erase(canonical_list_.begin(),
+ canonical_list_.begin() + next_load_index_ + 1);
+ }
+
next_load_index_ = 0;
LoadPluginsInternal();
« no previous file with comments | « no previous file | content/browser/plugin_loader_posix_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698