wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1064529 - Don't misuse invalid ipc::FileDescriptor in memory report requests. r=njn

Browse Source
This commit is contained in:
Jed Davis 2014-09-18 17:59:00 +02:00
parent 8b8b87c506
commit 1149458fa3
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/ipc/ContentChild.cpp
View File

@ -202,7 +202,7 @@ public:
NS_DECL_ISUPPORTS
MemoryReportRequestChild(uint32_t aGeneration, bool aAnonymize,
const FileDescriptor& aDMDFile);
const MaybeFileDesc& aDMDFile);
NS_IMETHOD Run();
private:
virtual ~MemoryReportRequestChild();
@ -215,11 +215,13 @@ private:
NS_IMPL_ISUPPORTS(MemoryReportRequestChild, nsIRunnable)
MemoryReportRequestChild::MemoryReportRequestChild(
uint32_t aGeneration, bool aAnonymize, const FileDescriptor& aDMDFile)
: mGeneration(aGeneration), mAnonymize(aAnonymize),
mDMDFile(aDMDFile)
uint32_t aGeneration, bool aAnonymize, const MaybeFileDesc& aDMDFile)
: mGeneration(aGeneration), mAnonymize(aAnonymize)
{
MOZ_COUNT_CTOR(MemoryReportRequestChild);
if (aDMDFile.type() == MaybeFileDesc::TFileDescriptor) {
mDMDFile = aDMDFile.get_FileDescriptor();
}
}
MemoryReportRequestChild::~MemoryReportRequestChild()
@ -707,7 +709,7 @@ PMemoryReportRequestChild*
ContentChild::AllocPMemoryReportRequestChild(const uint32_t& aGeneration,
const bool &aAnonymize,
const bool &aMinimizeMemoryUsage,
const FileDescriptor& aDMDFile)
const MaybeFileDesc& aDMDFile)
{
MemoryReportRequestChild *actor =
new MemoryReportRequestChild(aGeneration, aAnonymize, aDMDFile);
@ -765,7 +767,7 @@ ContentChild::RecvPMemoryReportRequestConstructor(
const uint32_t& aGeneration,
const bool& aAnonymize,
const bool& aMinimizeMemoryUsage,
const FileDescriptor& aDMDFile)
const MaybeFileDesc& aDMDFile)
{
MemoryReportRequestChild *actor =
static_cast<MemoryReportRequestChild*>(aChild);

4
dom/ipc/ContentChild.h
View File

@ -161,7 +161,7 @@ public:
AllocPMemoryReportRequestChild(const uint32_t& aGeneration,
const bool& aAnonymize,
const bool& aMinimizeMemoryUsage,
const FileDescriptor& aDMDFile) MOZ_OVERRIDE;
const MaybeFileDesc& aDMDFile) MOZ_OVERRIDE;
virtual bool
DeallocPMemoryReportRequestChild(PMemoryReportRequestChild* actor) MOZ_OVERRIDE;
@ -170,7 +170,7 @@ public:
const uint32_t& aGeneration,
const bool& aAnonymize,
const bool &aMinimizeMemoryUsage,
const FileDescriptor &aDMDFile) MOZ_OVERRIDE;
const MaybeFileDesc &aDMDFile) MOZ_OVERRIDE;
virtual PCycleCollectWithLogsChild*
AllocPCycleCollectWithLogsChild(const bool& aDumpAllTraces,

4
dom/ipc/ContentParent.cpp
View File

@ -2596,7 +2596,7 @@ ContentParent::Observe(nsISupports* aSubject,
// The pre-%n part of the string should be all ASCII, so the byte
// offset in identOffset should be correct as a char offset.
MOZ_ASSERT(cmsg[identOffset - 1] == '=');
FileDescriptor dmdFileDesc;
MaybeFileDesc dmdFileDesc = void_t();
#ifdef MOZ_DMD
nsAutoString dmdIdent(Substring(msg, identOffset));
if (!dmdIdent.IsEmpty()) {
@ -2984,7 +2984,7 @@ PMemoryReportRequestParent*
ContentParent::AllocPMemoryReportRequestParent(const uint32_t& aGeneration,
const bool &aAnonymize,
const bool &aMinimizeMemoryUsage,
const FileDescriptor &aDMDFile)
const MaybeFileDesc &aDMDFile)
{
MemoryReportRequestParent* parent = new MemoryReportRequestParent();
return parent;

2
dom/ipc/ContentParent.h
View File

@ -455,7 +455,7 @@ private:
AllocPMemoryReportRequestParent(const uint32_t& aGeneration,
const bool &aAnonymize,
const bool &aMinimizeMemoryUsage,
const FileDescriptor &aDMDFile) MOZ_OVERRIDE;
const MaybeFileDesc &aDMDFile) MOZ_OVERRIDE;
virtual bool DeallocPMemoryReportRequestParent(PMemoryReportRequestParent* actor) MOZ_OVERRIDE;
virtual PCycleCollectWithLogsParent*

7
dom/ipc/PContent.ipdl
View File

@ -303,6 +303,11 @@ struct VolumeInfo {
bool isFake;
};
union MaybeFileDesc {
FileDescriptor;
void_t;
};
intr protocol PContent
{
parent opens PCompositor;
@ -377,7 +382,7 @@ child:
async SetProcessSandbox();
PMemoryReportRequest(uint32_t generation, bool anonymize,
bool minimizeMemoryUsage, FileDescriptor DMDFile);
bool minimizeMemoryUsage, MaybeFileDesc DMDFile);
/**
* Notify the AudioChannelService in the child processes.