corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1132045 - Add handles to various equality operations. r=jandem

Browse Source
This commit is contained in:
Tom Schuster
2015-02-17 15:03:23 +01:00
parent c660932464
commit f46d880127
8 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
js/src/jsobj.cpp
View File

@@ -534,16 +534,18 @@ DefinePropertyOnObject(JSContext *cx, HandleNativeObject obj, HandleId id, const
break;
if (desc.hasGet()) {
RootedValue getter(cx, shape->getterOrUndefined());
bool same;
if (!SameValue(cx, desc.getterValue(), shape->getterOrUndefined(), &same))
if (!SameValue(cx, desc.getterValue(), getter, &same))
return false;
if (!same)
break;
}
if (desc.hasSet()) {
RootedValue setter(cx, shape->setterOrUndefined());
bool same;
if (!SameValue(cx, desc.setterValue(), shape->setterOrUndefined(), &same))
if (!SameValue(cx, desc.setterValue(), setter, &same))
return false;
if (!same)
break;
@@ -669,16 +671,18 @@ DefinePropertyOnObject(JSContext *cx, HandleNativeObject obj, HandleId id, const
MOZ_ASSERT(desc.isAccessorDescriptor() && shape->isAccessorDescriptor());
if (!shape->configurable()) {
if (desc.hasSet()) {
RootedValue setter(cx, shape->setterOrUndefined());
bool same;
if (!SameValue(cx, desc.setterValue(), shape->setterOrUndefined(), &same))
if (!SameValue(cx, desc.setterValue(), setter, &same))
return false;
if (!same)
return Reject(cx, JSMSG_CANT_REDEFINE_PROP, throwError, id, rval);
}
if (desc.hasGet()) {
RootedValue getter(cx, shape->getterOrUndefined());
bool same;
if (!SameValue(cx, desc.getterValue(), shape->getterOrUndefined(), &same))
if (!SameValue(cx, desc.getterValue(), getter, &same))
return false;
if (!same)
return Reject(cx, JSMSG_CANT_REDEFINE_PROP, throwError, id, rval);