Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 07:40:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 931571, part 13 - Add a destructor for nsDiscriminatedUnion. r=froydnj

Browse Source 
The existing nsDiscriminateUnions either always call Cleanup() when they
are about to go away, or they only handle scalar values so it is safe to
call Cleanup() on them without worrying about another discriminated union
having taken over any memory owned by this union.
This commit is contained in:
Andrew McCreight 2015-07-23 12:28:30 -07:00
parent 0994e4e4ed
commit 13e2d3a560
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/xpconnect/src/XPCVariant.cpp
View File

@ -603,7 +603,6 @@ XPCVariant::VariantDataToJS(nsIVariant* variant,
case nsIDataType::VTYPE_EMPTY:
default:
NS_ERROR("bad type in array!");
du.Cleanup();
return false;
}
@ -613,7 +612,6 @@ XPCVariant::VariantDataToJS(nsIVariant* variant,
conversionType, pid,
du.u.array.mArrayCount, pErr);
du.Cleanup();
return success;
}
case nsIDataType::VTYPE_EMPTY_ARRAY:

5
xpcom/ds/nsVariant.cpp
View File

@ -1721,11 +1721,6 @@ nsVariant::nsVariant()
#endif
}
nsVariant::~nsVariant()
{
mData.Cleanup();
}
// For all the data getters we just forward to the static (and sharable)
// 'ConvertTo' functions.

3
xpcom/ds/nsVariant.h
View File

@ -32,6 +32,7 @@ class nsDiscriminatedUnion
public:
nsDiscriminatedUnion() : mType(nsIDataType::VTYPE_EMPTY) {}
~nsDiscriminatedUnion() { Cleanup(); }
void Cleanup();
@ -181,7 +182,7 @@ public:
nsVariant();
private:
~nsVariant();
~nsVariant() {};
protected:
nsDiscriminatedUnion mData;