From: Arran Cudbard-Bell <a.cudbardb@freeradius.org>
Date: Thu, 26 Sep 2019 02:45:04 +0000 (-0500)
Subject: Partially Revert "Minor tweaks in the interpreter"
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4243d56ad886dc762222e46fc3f3fcd9ca52e0c8;p=thirdparty%2Ffreeradius-server.git

Partially Revert "Minor tweaks in the interpreter"

This reverts commit 60a53e88a54e31e98db6e8bbe40e10bd0608b21c.
---

diff --git a/src/lib/unlang/interpret.c b/src/lib/unlang/interpret.c
index bddb8f7daad..58f3a7c6bc6 100644
--- a/src/lib/unlang/interpret.c
+++ b/src/lib/unlang/interpret.c
@@ -423,12 +423,11 @@ static inline void frame_next(unlang_stack_frame_t *frame)
 {
 	frame_cleanup(frame);
 	frame->instruction = frame->next;
-
-	if (!frame->instruction) return;
-
-	frame->process = unlang_ops[frame->instruction->type].func;
-	frame->signal = unlang_ops[frame->instruction->type].signal;
-	frame->next = frame->instruction->next;
+	if (frame->instruction) {
+		frame->process = unlang_ops[frame->instruction->type].func;
+		frame->signal = unlang_ops[frame->instruction->type].signal;
+		frame->next = frame->instruction->next;
+	}
 }
 
 /** Pop a stack frame, removing any associated dynamically allocated state