diff options
author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 17:46:31 +0000 |
---|---|---|
committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-18 17:46:31 +0000 |
commit | b0af04c4b7595afcfcfe847e232bc6ae88101735 (patch) | |
tree | 9218ad9ed34635f3387dbbe7aca25a55e851e690 /base | |
parent | f4c6499a37788cd2bc2c4781f005ad2c03fd47e7 (diff) | |
download | chromium_src-b0af04c4b7595afcfcfe847e232bc6ae88101735.zip chromium_src-b0af04c4b7595afcfcfe847e232bc6ae88101735.tar.gz chromium_src-b0af04c4b7595afcfcfe847e232bc6ae88101735.tar.bz2 |
Fix a memory leak in ResourceDispatcher
When we delete a ResourceLoaderBridge before OnCompletedRequest is received, bad things happen. There's a lot of leaks at the following points:
1. OnMessageReceived ignores the message.
2. RemovePendingRequest removes it's internal deferred_message_queue.
But ViewHostMsg_Resource_DataReceived is not POD. We should also close the shared memory handle inside it.
Review URL: http://codereview.chromium.org/115396
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16297 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/shared_memory.h | 3 | ||||
-rw-r--r-- | base/shared_memory_posix.cc | 6 | ||||
-rw-r--r-- | base/shared_memory_win.cc | 6 |
3 files changed, 15 insertions, 0 deletions
diff --git a/base/shared_memory.h b/base/shared_memory.h index a368d9f..ea72069 100644 --- a/base/shared_memory.h +++ b/base/shared_memory.h @@ -61,6 +61,9 @@ class SharedMemory { // Return invalid handle (see comment above for exact definition). static SharedMemoryHandle NULLHandle(); + // Close a shared memory handle. + static void CloseHandle(const SharedMemoryHandle& handle); + // Creates or opens a shared memory segment based on a name. // If read_only is true, opens the memory as read-only. // If open_existing is true, and the shared memory already exists, diff --git a/base/shared_memory_posix.cc b/base/shared_memory_posix.cc index 2f0fe22..fe4b225 100644 --- a/base/shared_memory_posix.cc +++ b/base/shared_memory_posix.cc @@ -70,6 +70,12 @@ SharedMemoryHandle SharedMemory::NULLHandle() { return SharedMemoryHandle(); } +// static +void SharedMemory::CloseHandle(const SharedMemoryHandle& handle) { + DCHECK(handle.fd >= 0); + close(handle.fd); +} + bool SharedMemory::Create(const std::wstring &name, bool read_only, bool open_existing, size_t size) { read_only_ = read_only; diff --git a/base/shared_memory_win.cc b/base/shared_memory_win.cc index 66f8fb6..dd4c73b 100644 --- a/base/shared_memory_win.cc +++ b/base/shared_memory_win.cc @@ -55,6 +55,12 @@ SharedMemoryHandle SharedMemory::NULLHandle() { return NULL; } +// static +void SharedMemory::CloseHandle(const SharedMemoryHandle& handle) { + DCHECK(handle != NULL); + ::CloseHandle(handle); +} + bool SharedMemory::Create(const std::wstring &name, bool read_only, bool open_existing, size_t size) { DCHECK(mapped_file_ == NULL); |