Media Galleries: Check for invalid files before passing them to the utility process.

chrome/browser/media_galleries/fileapi/safe_audio_video_checker.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/media_galleries/fileapi/safe_audio_video_checker.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 36 matching lines @@
 
 void SafeAudioVideoChecker::OnProcessStarted() {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   if (state_ != PINGED_STATE)
     return;
   state_ = STARTED_STATE;
 
   if (utility_process_host_->GetData().handle == base::kNullProcessHandle)
     DLOG(ERROR) << "Child process handle is null";
   IPC::PlatformFileForTransit file_for_transit =
       IPC::TakeFileHandleForProcess(file_.Pass(),

[rvargas (doing something else), 2014/08/05 23:40:19]

nit: seems better to see if file_.IsValid() instead.

[Lei Zhang, 2014/08/05 23:46:38]

We already do that on line 35. I suspect maybe DuplicateHandle() occasionally
fails for whatever reason.

[rvargas (doing something else), 2014/08/06 00:08:03]

You are absolutely right!.

                                     utility_process_host_->GetData().handle);
+  if (file_for_transit == IPC::InvalidPlatformFileForTransit()) {
+    OnCheckingFinished(false /* valid? */);
+    return;
+  }
   const int64 kFileDecodeTimeInMS = 250;
   utility_process_host_->Send(new ChromeUtilityMsg_CheckMediaFile(
       kFileDecodeTimeInMS, file_for_transit));
 }
 
 void SafeAudioVideoChecker::OnCheckingFinished(bool valid) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::IO);
   if (state_ != STARTED_STATE)
     return;
   state_ = FINISHED_STATE;
@@ skipping 10 matching lines @@
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(SafeAudioVideoChecker, message)
     IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_ProcessStarted,
         OnProcessStarted)
     IPC_MESSAGE_HANDLER(ChromeUtilityHostMsg_CheckMediaFile_Finished,
         OnCheckingFinished)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }