Add a size parameter to SharedMemoryHandle.

base/memory/shared_memory_win.cc

 // Copyright (c) 2011 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 "base/memory/shared_memory.h"
 
 #include <aclapi.h>
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 209 matching lines @@
     // So, we generate a random name when we need to enforce read-only.
     uint64_t rand_values[4];
     RandBytes(&rand_values, sizeof(rand_values));
     name_ = StringPrintf(L"CrSharedMem_%016llx%016llx%016llx%016llx",
                          rand_values[0], rand_values[1],
                          rand_values[2], rand_values[3]);
   }
   DCHECK(!name_.empty());
   shm_ = SharedMemoryHandle(
       CreateFileMappingWithReducedPermissions(&sa, rounded_size, name_.c_str()),
-      UnguessableToken::Create());
+      rounded_size, UnguessableToken::Create());
   if (!shm_.IsValid()) {
     // The error is logged within CreateFileMappingWithReducedPermissions().
     return false;
   }
 
   requested_size_ = options.size;
 
   // Check if the shared memory pre-exists.
   if (GetLastError() == ERROR_ALREADY_EXISTS) {
     // If the file already existed, set requested_size_ to 0 to show that
@@ skipping 26 matching lines @@
   read_only_ = read_only;
 
   // This form of sharing shared memory is deprecated. https://crbug.com/345734.
   // However, we can't get rid of it without a significant refactor because its
   // used to communicate between two versions of the same service process, very
   // early in the life cycle.
   // Technically, we should also pass the GUID from the original shared memory
   // region. We don't do that - this means that we will overcount this memory,
   // which thankfully isn't relevant since Chrome only communicates with a
   // single version of the service process.
+  // We pass the size |0|, which is a dummy size and wrong, but otherwise
+  // harmless.
   shm_ = SharedMemoryHandle(
       OpenFileMapping(access, false, name_.empty() ? nullptr : name_.c_str()),
-      UnguessableToken::Create());
+      0u, UnguessableToken::Create());
   if (!shm_.IsValid())
     return false;
   // If a name specified assume it's an external section.
   if (!name_.empty())
     external_section_ = true;
   // Note: size_ is not set in this case.
   return true;
 }
 
 bool SharedMemory::MapAt(off_t offset, size_t bytes) {
@@ skipping 31 matching lines @@
   return true;
 }
 
 SharedMemoryHandle SharedMemory::GetReadOnlyHandle() {
   HANDLE result;
   ProcessHandle process = GetCurrentProcess();
   if (!::DuplicateHandle(process, shm_.GetHandle(), process, &result,
                          FILE_MAP_READ | SECTION_QUERY, FALSE, 0)) {
     return SharedMemoryHandle();
   }
-  SharedMemoryHandle handle = SharedMemoryHandle(result, shm_.GetGUID());
+  SharedMemoryHandle handle =
+      SharedMemoryHandle(result, shm_.GetSize(), shm_.GetGUID());
   handle.SetOwnershipPassesToIPC(true);
   return handle;
 }
 
 void SharedMemory::Close() {
   if (shm_.IsValid()) {
     shm_.Close();
     shm_ = SharedMemoryHandle();
   }
 }
 
 SharedMemoryHandle SharedMemory::handle() const {
   return shm_;
 }
 
 SharedMemoryHandle SharedMemory::TakeHandle() {
   SharedMemoryHandle handle(shm_);
   handle.SetOwnershipPassesToIPC(true);
   shm_ = SharedMemoryHandle();
   memory_ = nullptr;
   mapped_size_ = 0;
   return handle;
 }
 
 }  // namespace base