From: Arran Cudbard-Bell Date: Tue, 10 Sep 2019 14:27:31 +0000 (-0500) Subject: We really do only need to set top_frame when pushing new things onto the stack X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6133634c58abd9d5cd83f2fff526b7ee86e29523;p=thirdparty%2Ffreeradius-server.git We really do only need to set top_frame when pushing new things onto the stack --- diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c index 4ce0cb6518a..aca79646893 100644 --- a/src/lib/unlang/interpret.c +++ b/src/lib/unlang/interpret.c @@ -258,22 +258,7 @@ void unlang_interpret_push(REQUEST *request, unlang_t *instruction, } frame->uflags = UNWIND_FLAG_NONE; - - /* - * Set flags which tell us when to stop. Note that a top - * frame *also* stops "break" and "return". - * - * There's no real reason to have a top-frame stop - * "break". The compiler should already have caught it, - * and complained about using "break" without an - * enclosing "foreach". But it's a useful check to have. - */ - if (top_frame) { - top_frame_set(frame); - return_point_set(frame); - break_point_set(frame); - } - + if (top_frame) top_frame_set(frame); frame->instruction = instruction; frame->result = default_rcode; frame->priority = -1;