Bug 510091 - Fennec crash on mousedown on an iframe. r=Waldo.

This commit is contained in:
Jason Orendorff
2009-08-13 16:07:13 -05:00
parent a6fb03cfca
commit 76e5461194

View File

@@ -2284,7 +2284,7 @@ Detecting(JSContext *cx, jsbytecode *pc)
script = cx->fp->script;
endpc = script->code + script->length;
for (;; pc += js_CodeSpec[op].length) {
JS_ASSERT(pc < endpc);
JS_ASSERT_IF(!cx->fp->imacpc, script->code <= pc && pc < endpc);
/* General case: a branch or equality op follows the access. */
op = js_GetOpcode(cx, script, pc);
@@ -4249,7 +4249,8 @@ js_GetPropertyHelper(JSContext *cx, JSObject *obj, jsid id, JSBool cacheResult,
flags = JSREPORT_ERROR;
} else {
if (!JS_HAS_STRICT_OPTION(cx) ||
(op != JSOP_GETPROP && op != JSOP_GETELEM)) {
(op != JSOP_GETPROP && op != JSOP_GETELEM) ||
cx->fp->imacpc) {
return JS_TRUE;
}