BUG/MINOR: hlua: Don't strip last non-LWS char in hlua_pushstrippedstring()

hlua_pushstrippedstring() function strips leading and trailing LWS
characters. But the result length it too short by 1 byte. Thus the last
non-LWS character is stripped. Note that a string containing only LWS
characters resulting to a stipped string with an invalid length (-1). This
leads to a lua runtime error.

This bug was reported in the issue #1155. It must be backported as far as
1.7.

(cherry picked from commit 2ec4e3c1acf95bcdc56028bbefe1a355c457b978)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit 598ec14ca797b61f25f183216323d533a7c45c5e)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 50e5b6ec5e0e5122e71f49c2f537f8e20dbeae9d)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

diff --git a/src/hlua_fcn.c b/src/hlua_fcn.c
index 201ac9a..3f1b45d 100644 (file)
--- a/src/hlua_fcn.c
+++ b/src/hlua_fcn.c
@@ -172,12 +172,13 @@ int hlua_fcn_pushfield(lua_State *L, struct field *field)
 const char *hlua_pushstrippedstring(lua_State *L, const char *str)
 {
        const char *p;
-       const char *e;
+       int l;
 
        for (p = str; HTTP_IS_LWS(*p); p++);
-       for (e = p + strlen(p) - 1; e > p && HTTP_IS_LWS(*e); e--);
 
-       return lua_pushlstring(L, p, e - p);
+       for (l = strlen(p); l && HTTP_IS_LWS(p[l-1]); l--);
+
+       return lua_pushlstring(L, p, l);
 }
 
 /* The three following functions are useful for adding entries