wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-27 17:47:34 +09:00
Code Issues Projects Releases Packages Wiki Activity

[js, ARM] Always check error return from BufferOffset::diffB.

Browse source 
We were missing error checks at two points. In one case an error return
is meaningful; in another case it is not, as the problem should have
been guarded against at a higher level by emitting far jump islands soon
enough during pasteup of compiled code.
This commit is contained in:
Lars T Hansen 2019-05-25 15:41:06 +02:00 • committed by Roy Tam
commit 772e51c7b4
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
js/src/jit/arm/Assembler-arm.cpp
View file

@ -2401,7 +2401,12 @@ Assembler::as_b(Label* l, Condition c)
if (oom()) if (oom())
return BufferOffset(); return BufferOffset();
as_b(BufferOffset(l).diffB<BOffImm>(ret), c, ret); BOffImm off = BufferOffset(l).diffB<BOffImm>(ret);
if (off.isInvalid()) {
m_buffer.fail_bail();
return BufferOffset();
}
as_b(off, c, ret);
#ifdef JS_DISASM_ARM #ifdef JS_DISASM_ARM
spewBranch(m_buffer.getInstOrNull(ret), l); spewBranch(m_buffer.getInstOrNull(ret), l);
#endif #endif

5
js/src/jit/arm/MacroAssembler-arm.cpp
View file

@ -5012,7 +5012,10 @@ void
MacroAssembler::patchCall(uint32_t callerOffset, uint32_t calleeOffset) MacroAssembler::patchCall(uint32_t callerOffset, uint32_t calleeOffset)
{ {
BufferOffset inst(callerOffset - 4); BufferOffset inst(callerOffset - 4);
as_bl(BufferOffset(calleeOffset).diffB<BOffImm>(inst), Always, inst); BOffImm off = BufferOffset(calleeOffset).diffB<BOffImm>(inst);
MOZ_RELEASE_ASSERT(!off.isInvalid(),
"Failed to insert necessary far jump islands");
as_bl(off, Always, inst);
} }
CodeOffset CodeOffset