Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-19 16:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1306008 - Use new to allocate NPObjectMemberPrivate r=mccr8

Browse Source 
Previously NPObjectMemberPrivate was allocated with malloc which bypassed Heap<T>'s constructors.

Differential Revision: https://phabricator.services.mozilla.com/D25085
This commit is contained in:
Jon Coppeard 2019-03-27 16:26:23 +00:00
parent e16c189b22
commit d9da2ae5c3
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dom/plugins/base/nsJSNPRuntime.cpp
View File

@ -238,7 +238,7 @@ typedef struct NPObjectMemberPrivate {
JS::Heap<JSObject *> npobjWrapper;
JS::Heap<JS::Value> fieldValue;
JS::Heap<jsid> methodName;
NPP npp;
NPP npp = nullptr;
} NPObjectMemberPrivate;
static void NPObjectMember_Finalize(JSFreeOp *fop, JSObject *obj);
@ -1991,19 +1991,13 @@ static bool CreateNPObjectMember(NPP npp, JSContext *cx,
return false;
}
NPObjectMemberPrivate *memberPrivate =
(NPObjectMemberPrivate *)malloc(sizeof(NPObjectMemberPrivate));
if (!memberPrivate) return false;
// Make sure to clear all members in case something fails here
// during initialization.
memset(memberPrivate, 0, sizeof(NPObjectMemberPrivate));
NPObjectMemberPrivate *memberPrivate = new NPObjectMemberPrivate;
JS::Rooted<JSObject *> obj(cx, aObj);
JS::Rooted<JSObject *> memobj(cx, ::JS_NewObject(cx, &sNPObjectMemberClass));
if (!memobj) {
free(memberPrivate);
delete memberPrivate;
return false;
}
@ -2064,7 +2058,7 @@ static void NPObjectMember_Finalize(JSFreeOp *fop, JSObject *obj) {
memberPrivate = (NPObjectMemberPrivate *)::JS_GetPrivate(obj);
if (!memberPrivate) return;
free(memberPrivate);
delete memberPrivate;
}
static bool NPObjectMember_Call(JSContext *cx, unsigned argc, JS::Value *vp) {