From 1e5ed65ff5591f942dda9bcdb351bfbe3b338fe8 Mon Sep 17 00:00:00 2001
From: Benjamin Smedberg <benjamin@smedbergs.us>
Date: Thu, 17 Dec 2009 16:39:22 -0500
Subject: [PATCH] Bug 534736, and perhaps some others: parent crash within
 mozilla::plugins::PPluginInstanceParent::DestroySubtree, r=cjones

---
 ipc/ipdl/ipdl/lower.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipc/ipdl/ipdl/lower.py b/ipc/ipdl/ipdl/lower.py
index 650220d9012c..d45404474acb 100644
--- a/ipc/ipdl/ipdl/lower.py
+++ b/ipc/ipdl/ipdl/lower.py
@@ -3353,11 +3353,11 @@ class _GenerateProtocolActorCode(ipdl.ast.Visitor):
         failif.addifstmts(
             self.unregisterActor(actorvar)
             + [ StmtExpr(ExprCall(_deallocMethod(md.decl.type.constructedType()), args=[actorvar])),
-                StmtReturn(ExprLiteral.NULL),
                 StmtExpr(_callCxxArrayRemoveSorted(
                     self.protocol.managedVar(
                         md.decl.type.constructedType(), self.side),
-                    actorvar))
+                    actorvar)),
+                StmtReturn(ExprLiteral.NULL),
             ])
         return [ failif ]