зеркало из https://github.com/mozilla/pjs.git
Bug 747870 - Properly align XPCLazyCallContext::mData. r=bholley
This commit is contained in:
Родитель
0f59bb65bb
Коммит
ae37a8da89
|
@ -1310,12 +1310,13 @@ public:
|
|||
XPCCallContext &GetXPCCallContext()
|
||||
{
|
||||
if (!mCcx) {
|
||||
XPCCallContext *data = mData.addr();
|
||||
mCcxToDestroy = mCcx =
|
||||
new (mData) XPCCallContext(mCallerLanguage, mCx,
|
||||
mCallBeginRequest == CALL_BEGINREQUEST,
|
||||
mObj,
|
||||
mFlattenedJSObject, mWrapper,
|
||||
mTearOff);
|
||||
new (data) XPCCallContext(mCallerLanguage, mCx,
|
||||
mCallBeginRequest == CALL_BEGINREQUEST,
|
||||
mObj,
|
||||
mFlattenedJSObject, mWrapper,
|
||||
mTearOff);
|
||||
if (!mCcx->IsValid()) {
|
||||
NS_ERROR("This is not supposed to fail!");
|
||||
}
|
||||
|
@ -1343,7 +1344,7 @@ private:
|
|||
JSObject *mFlattenedJSObject;
|
||||
XPCWrappedNative *mWrapper;
|
||||
XPCWrappedNativeTearOff *mTearOff;
|
||||
char mData[sizeof(XPCCallContext)];
|
||||
mozilla::AlignedStorage2<XPCCallContext> mData;
|
||||
};
|
||||
|
||||
/***************************************************************************
|
||||
|
|
Загрузка…
Ссылка в новой задаче