summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 22:47:42 +0000
committerjhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-06-21 22:47:42 +0000
commita3e0cb18e35b6a79e4088b313d448de655d01e5a (patch)
tree12a2ebc8f5c94cb80b35265b1c1786b4134f0cae /content
parentd6341d7f57d31919084a94c93697fca37528486a (diff)
downloadchromium_src-a3e0cb18e35b6a79e4088b313d448de655d01e5a.zip
chromium_src-a3e0cb18e35b6a79e4088b313d448de655d01e5a.tar.gz
chromium_src-a3e0cb18e35b6a79e4088b313d448de655d01e5a.tar.bz2
Coverity: Handle negative returns.
CID=16270,16859,17628 BUG=none TEST=none R=kmadhusu@chromium.org Review URL: http://codereview.chromium.org/7215031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@89916 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/renderer_host/database_message_filter.cc1
-rw-r--r--content/browser/renderer_host/pepper_file_message_filter.cc3
-rw-r--r--content/common/gpu/gpu_channel_manager.cc1
3 files changed, 4 insertions, 1 deletions
diff --git a/content/browser/renderer_host/database_message_filter.cc b/content/browser/renderer_host/database_message_filter.cc
index 63afbfa2..becce16 100644
--- a/content/browser/renderer_host/database_message_filter.cc
+++ b/content/browser/renderer_host/database_message_filter.cc
@@ -184,6 +184,7 @@ void DatabaseMessageFilter::OnDatabaseOpenFile(const string16& vfs_file_name,
// process. The original handle is closed, unless we saved it in the
// database tracker.
bool auto_close = !db_tracker_->HasSavedIncognitoFileHandle(vfs_file_name);
+ DCHECK_NE(base::kInvalidPlatformFileValue, file_handle);
target_handle =
IPC::GetFileHandleForProcess(file_handle, peer_handle(), auto_close);
diff --git a/content/browser/renderer_host/pepper_file_message_filter.cc b/content/browser/renderer_host/pepper_file_message_filter.cc
index 4ab1aa3..1d2660d 100644
--- a/content/browser/renderer_host/pepper_file_message_filter.cc
+++ b/content/browser/renderer_host/pepper_file_message_filter.cc
@@ -88,7 +88,8 @@ void PepperFileMessageFilter::OnOpenFile(
base::PlatformFile file_handle = base::CreatePlatformFile(
full_path, flags, NULL, error);
- if (*error != base::PLATFORM_FILE_OK) {
+ if (*error != base::PLATFORM_FILE_OK ||
+ file_handle == base::kInvalidPlatformFileValue) {
*file = IPC::InvalidPlatformFileForTransit();
return;
}
diff --git a/content/common/gpu/gpu_channel_manager.cc b/content/common/gpu/gpu_channel_manager.cc
index ca02d43..21187c6 100644
--- a/content/common/gpu/gpu_channel_manager.cc
+++ b/content/common/gpu/gpu_channel_manager.cc
@@ -89,6 +89,7 @@ void GpuChannelManager::OnEstablishChannel(int renderer_id) {
// On POSIX, pass the renderer-side FD. Also mark it as auto-close so
// that it gets closed after it has been sent.
int renderer_fd = channel->GetRendererFileDescriptor();
+ DCHECK_NE(-1, renderer_fd);
channel_handle.socket = base::FileDescriptor(dup(renderer_fd), true);
#endif
}