Filter: Fix return on top-level

Broken detection of top-level case caused crash when return was called
from top-of-stack position. It should behave as reject/accept.

Thanks to Damian Zaremba for the bugreport.

diff --git a/filter/f-inst.c b/filter/f-inst.c
index 58717d558556c0e48415f32f64a9364bd4f3f7b0..b6bc81f7bd15e704518464734a2de848960173ea 100644 (file)
--- a/filter/f-inst.c
+++ b/filter/f-inst.c
@@ -922,18 +922,17 @@
     uint retpos = fstk->vcnt;
 
     /* Drop every sub-block including ourselves */
-    while ((fstk->ecnt-- > 0) && !(fstk->estk[fstk->ecnt].emask & FE_RETURN))
-      ;
+    do fstk->ecnt--;
+    while ((fstk->ecnt > 0) && !(fstk->estk[fstk->ecnt].emask & FE_RETURN));
 
     /* Now we are at the caller frame; if no such, try to convert to accept/reject. */
     if (!fstk->ecnt)
+    {
       if (fstk->vstk[retpos].type == T_BOOL)
-       if (fstk->vstk[retpos].val.i)
-         return F_ACCEPT;
-       else
-         return F_REJECT;
+       return (fstk->vstk[retpos].val.i) ? F_ACCEPT :  F_REJECT;
       else
        runtime("Can't return non-bool from non-function");
+    }
 
     /* Set the value stack position, overwriting the former implicit void */
     fstk->vcnt = fstk->estk[fstk->ecnt].ventry - 1;