Fix race condition if we get the model file in between the time that a RenderProcessHost is created and when it's launched. Also fix the same race condition in the spellcheck code.

Review URL: http://codereview.chromium.org/6907002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83802 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 6 insertions, 2 deletions

diff --git a/chrome/browser/safe_browsing/client_side_detection_service.cc b/chrome/browser/safe_browsing/client_side_detection_service.cc
index 8bcf7df..2521eb4 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service.cc
@@ -183,7 +183,9 @@ void ClientSideDetectionService::SetModelStatus(ModelStatus status) {
 
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
-    SendModelToProcess(i.GetCurrentValue());
+    RenderProcessHost* process = i.GetCurrentValue();
+    if (process->GetHandle())
+      SendModelToProcess(process);
   }
 }
 
diff --git a/chrome/browser/spellcheck_host_impl.cc b/chrome/browser/spellcheck_host_impl.cc
index 92386bc..fb81413 100644
--- a/chrome/browser/spellcheck_host_impl.cc
+++ b/chrome/browser/spellcheck_host_impl.cc
@@ -252,7 +252,9 @@ void SpellCheckHostImpl::InformObserverOfInitialization() {
 
   for (RenderProcessHost::iterator i(RenderProcessHost::AllHostsIterator());
        !i.IsAtEnd(); i.Advance()) {
-    InitForRenderer(i.GetCurrentValue());
+    RenderProcessHost* process = i.GetCurrentValue();
+    if (process)
+      InitForRenderer(process);
   }
 }