From: Olivier Houchard <ohouchard@haproxy.com>
Date: Mon, 27 Aug 2018 10:59:14 +0000 (+0200)
Subject: BUG/MEDIUM: hlua: Don't call RESET_SAFE_LJMP if SET_SAFE_LJMP returns 0.
X-Git-Tag: v1.9-dev2~104
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e643ea17257432c6079a8644401271a2a80619a;p=thirdparty%2Fhaproxy.git

BUG/MEDIUM: hlua: Don't call RESET_SAFE_LJMP if SET_SAFE_LJMP returns 0.

If SET_SAFE_LJMP returns 0, the spinlock is already unlocked, and lua_atpanic
is already set back to hlua_panic_safe, so there's no need to call
RESET_SAFE_LJMP.

This should be MFC'd into 1.8.
---

diff --git a/src/hlua.c b/src/hlua.c
index 67bc93c6bb..f07df4708d 100644
--- a/src/hlua.c
+++ b/src/hlua.c
@@ -6391,7 +6391,6 @@ static int hlua_applet_tcp_init(struct appctx *ctx, struct proxy *px, struct str
 			error = "critical error";
 		SEND_ERR(px, "Lua applet tcp '%s': %s.\n",
 		         ctx->rule->arg.hlua_rule->fcn.name, error);
-		RESET_SAFE_LJMP(hlua->T);
 		return 0;
 	}