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 683802 - Add jsval to the XPTCMiniVariant union for type safety. r=mrbkap

Browse Source
This commit is contained in:
Bobby Holley 2011-09-25 15:38:01 +01:00
parent 8a2ae11493
commit c6981dfa25
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/xpconnect/src/xpcwrappednative.cpp
View File

@ -2848,12 +2848,9 @@ CallMethodHelper::ConvertIndependentParam(uint8 i)
// indirectly, regardless of in/out-ness.
if(type_tag == nsXPTType::T_JSVAL)
{
// Assign the value
JS_STATIC_ASSERT(sizeof(jsval) <= sizeof(dp->val));
jsval *rootp = (jsval *)&dp->val;
dp->ptr = rootp;
*rootp = JSVAL_VOID;
if(!JS_AddValueRoot(mCallContext, rootp))
// Root the value.
dp->val.j = JSVAL_VOID;
if (!JS_AddValueRoot(mCallContext, &dp->val.j))
return JS_FALSE;
dp->SetValIsJSRoot();
}

6
xpcom/reflect/xptcall/public/xptcall.h
View File

@ -52,6 +52,7 @@
#include "nsISupports.h"
#include "xpt_struct.h"
#include "xptinfo.h"
#include "jsapi.h"
struct nsXPTCMiniVariant
{
@ -73,6 +74,11 @@ struct nsXPTCMiniVariant
char c;
PRUnichar wc;
void* p;
// Types below here are unknown to the assembly implementations, and
// therefore _must_ be passed with indirect semantics. We put them in
// the union here for type safety, so that we can avoid void* tricks.
jsval j;
} val;
};