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

Bug 968244 - Make IPDL-generated code not crash on bad shmems - r=bent

Browse Source
This commit is contained in:
Benoit Jacob 2014-02-25 08:57:10 -05:00
parent a6f546f393
commit c2a3a79571
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ipc/ipdl/ipdl/lower.py
View File

@ -4035,8 +4035,10 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
# bool AdoptShmem(const Shmem& mem, Shmem* outmem):
# SharedMemory* raw = mem.mSegment;
# if (!raw || IsTrackingSharedMemory(raw))
# RUNTIMEABORT()
# if (!raw || IsTrackingSharedMemory(raw)) {
# NS_WARNING("bad Shmem"); // or NS_RUNTIMEABORT on child side
# return false;
# }
# id_t id
# if (!AdoptSharedMemory(raw, &id))
# return false
@ -4053,7 +4055,14 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
ifbad = StmtIf(ExprBinary(
ExprNot(rawvar), '||',
ExprCall(ExprVar('IsTrackingSharedMemory'), args=[ rawvar ])))
ifbad.addifstmt(_runtimeAbort('bad Shmem'))
badShmemActions = []
if (self.side == 'child'):
badShmemActions.append(_runtimeAbort('bad Shmem'));
else:
badShmemActions.append(_printWarningMessage('bad Shmem'));
badShmemActions.append(StmtReturn.FALSE);
ifbad.addifstmts(badShmemActions)
adoptShmem.addstmt(ifbad)
ifadoptfails = StmtIf(ExprNot(ExprCall(
@ -4074,7 +4083,8 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
# bool ok = DestroySharedMemory(mem);
##ifdef DEBUG
# if (!ok) {
# NS_RUNTIMEABORT("bad Shmem");
# NS_WARNING("bad Shmem"); // or NS_RUNTIMEABORT on child side
# return false;
# }
##endif // DEBUG
# mem.forget();
@ -4086,7 +4096,7 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
okvar = ExprVar('ok')
ifbad = StmtIf(ExprNot(okvar))
ifbad.addifstmt(_runtimeAbort('bad Shmem'))
ifbad.addifstmts(badShmemActions)
deallocShmem.addstmts([
StmtDecl(Decl(Type.BOOL, okvar.name),