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

Fix from Michael Daumling <daumling@adobe.com> to make read-only assignment a strict warning (315436, r/sr=mrbkap/brendan).

Browse Source
This commit is contained in:
brendan%mozilla.org 2005-12-01 02:26:35 +00:00
parent ef2f143ba1
commit 16b5d0988a
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
js/src/jsobj.c
View File

@ -427,15 +427,15 @@ MarkSharpObjects(JSContext *cx, JSObject *obj, JSIdArray **idap)
return NULL;
}
/*
/*
* Increment map->depth to protect js_EnterSharpObject from reentering
* itself badly. Without this fix, if we reenter the basis case where
* map->depth == 0, when unwinding the inner call we will destroy the
* newly-created hash table and crash.
*/
++map->depth;
++map->depth;
ida = JS_Enumerate(cx, obj);
--map->depth;
--map->depth;
if (!ida)
return NULL;
@ -3017,8 +3017,26 @@ js_SetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
if ((attrs & JSPROP_READONLY) ||
(SCOPE_IS_SEALED(scope) && pobj == obj)) {
JS_UNLOCK_SCOPE(cx, scope);
if ((attrs & JSPROP_READONLY) && JS_VERSION_IS_ECMA(cx))
if ((attrs & JSPROP_READONLY) && JS_VERSION_IS_ECMA(cx)) {
if (JS_HAS_STRICT_OPTION(cx)) {
/* Strict mode: report a read-only warning. */
JSString *str =
js_DecompileValueGenerator(cx, JSDVG_IGNORE_STACK,
ID_TO_VALUE(id),
NULL);
if (!str)
return JS_FALSE;
return JS_ReportErrorFlagsAndNumberUC(cx,
JSREPORT_STRICT |
JSREPORT_WARNING,
js_GetErrorMessage,
NULL,
JSMSG_READ_ONLY,
JS_GetStringChars(str));
}
/* Just return true per ECMA if not in strict mode. */
return JS_TRUE;
}
goto read_only_error;
}
@ -3141,9 +3159,9 @@ js_SetProperty(JSContext *cx, JSObject *obj, jsid id, jsval *vp)
ID_TO_VALUE(id),
NULL);
if (str) {
JS_ReportErrorNumber(cx, js_GetErrorMessage, NULL,
JSMSG_READ_ONLY,
JS_GetStringBytes(str));
JS_ReportErrorNumberUC(cx, js_GetErrorMessage, NULL,
JSMSG_READ_ONLY,
JS_GetStringChars(str));
}
return JS_FALSE;
}