summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 18:19:49 +0000
committerananta@chromium.org <ananta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 18:19:49 +0000
commit121648a44c1bc7e210646387e12fa965e890943c (patch)
tree34b8852783e0a56b099f5c2338d26b0c5abf5e50 /base
parent2f86595354652700034e0aa8a75b90c54bf1cc2a (diff)
downloadchromium_src-121648a44c1bc7e210646387e12fa965e890943c.zip
chromium_src-121648a44c1bc7e210646387e12fa965e890943c.tar.gz
chromium_src-121648a44c1bc7e210646387e12fa965e890943c.tar.bz2
While enumerating plugins under the MozillaPlugins registry key, we should ignore 64 bit
plugins. We validate whether a plugin is a 32 bit dll by reading its PE image. This fixes bug http://code.google.com/p/chromium/issues/detail?id=73032 Added support for the win32 version of the MemoryMappedFile helper class in base to map a file as an image section. BUG=73032 TEST=As described in the bug at this point. Review URL: http://codereview.chromium.org/6611028 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/file_util.h12
-rw-r--r--base/file_util_win.cc26
2 files changed, 36 insertions, 2 deletions
diff --git a/base/file_util.h b/base/file_util.h
index d89fa71..108c998 100644
--- a/base/file_util.h
+++ b/base/file_util.h
@@ -506,6 +506,12 @@ class MemoryMappedFile {
// ownership of |file| and close it when done.
bool Initialize(base::PlatformFile file);
+#if defined(OS_WIN)
+ // Opens an existing file and maps it as an image section. Please refer to
+ // the Initialize function above for additional information.
+ bool InitializeAsImageSection(const FilePath& file_name);
+#endif // OS_WIN
+
const uint8* data() const { return data_; }
size_t length() const { return length_; }
@@ -523,10 +529,14 @@ class MemoryMappedFile {
// Closes all open handles. Later we may want to make this public.
void CloseHandles();
- base::PlatformFile file_;
#if defined(OS_WIN)
+ // MapFileToMemoryInternal calls this function. It provides the ability to
+ // pass in flags which control the mapped section.
+ bool MapFileToMemoryInternalEx(int flags);
+
HANDLE file_mapping_;
#endif
+ base::PlatformFile file_;
uint8* data_;
size_t length_;
diff --git a/base/file_util_win.cc b/base/file_util_win.cc
index ab1dc94..2c26a16 100644
--- a/base/file_util_win.cc
+++ b/base/file_util_win.cc
@@ -938,7 +938,31 @@ MemoryMappedFile::MemoryMappedFile()
length_(INVALID_FILE_SIZE) {
}
+bool MemoryMappedFile::InitializeAsImageSection(const FilePath& file_name) {
+ if (IsValid())
+ return false;
+ file_ = base::CreatePlatformFile(
+ file_name, base::PLATFORM_FILE_OPEN | base::PLATFORM_FILE_READ,
+ NULL, NULL);
+
+ if (file_ == base::kInvalidPlatformFileValue) {
+ LOG(ERROR) << "Couldn't open " << file_name.value();
+ return false;
+ }
+
+ if (!MapFileToMemoryInternalEx(SEC_IMAGE)) {
+ CloseHandles();
+ return false;
+ }
+
+ return true;
+}
+
bool MemoryMappedFile::MapFileToMemoryInternal() {
+ return MapFileToMemoryInternalEx(0);
+}
+
+bool MemoryMappedFile::MapFileToMemoryInternalEx(int flags) {
base::ThreadRestrictions::AssertIOAllowed();
if (file_ == INVALID_HANDLE_VALUE)
@@ -950,7 +974,7 @@ bool MemoryMappedFile::MapFileToMemoryInternal() {
// length_ value comes from GetFileSize() above. GetFileSize() returns DWORD,
// therefore the cast here is safe.
- file_mapping_ = ::CreateFileMapping(file_, NULL, PAGE_READONLY,
+ file_mapping_ = ::CreateFileMapping(file_, NULL, PAGE_READONLY | flags,
0, static_cast<DWORD>(length_), NULL);
if (!file_mapping_) {
// According to msdn, system error codes are only reserved up to 15999.