mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-05-04 20:46:11 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: lua: const attribute of a string is overridden

Browse Source 
If HAProxy is compiled without PCRE regexes, this can cause
a write in const memory. The probability of a consequence is
very low.
This commit is contained in:
Thierry FOURNIER 2017-10-27 14:13:51 +02:00 committed by Willy Tarreau
parent ccaa7de72e
commit 7c210e6aa8
1 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/hlua_fcn.c
View File

@ -1119,11 +1119,22 @@ static int hlua_regex_exec(struct lua_State *L)
struct my_regex *regex;
const char *str;
size_t len;
struct chunk *tmp;
regex = hlua_check_regex(L, 1);
str = luaL_checklstring(L, 2, &len);
lua_pushboolean(L, regex_exec2(regex, (char *)str, len));
/* Copy the string because regex_exec2 require a 'char *'
* and not a 'const char *'.
*/
tmp = get_trash_chunk();
if (len >= tmp->size) {
lua_pushboolean(L, 0);
return 1;
}
memcpy(tmp->str, str, len);
lua_pushboolean(L, regex_exec2(regex, tmp->str, len));
return 1;
}
@ -1136,11 +1147,22 @@ static int hlua_regex_match(struct lua_State *L)
regmatch_t pmatch[20];
int ret;
int i;
struct chunk *tmp;
regex = hlua_check_regex(L, 1);
str = luaL_checklstring(L, 2, &len);
ret = regex_exec_match2(regex, (char *)str, len, 20, pmatch, 0);
/* Copy the string because regex_exec2 require a 'char *'
* and not a 'const char *'.
*/
tmp = get_trash_chunk();
if (len >= tmp->size) {
lua_pushboolean(L, 0);
return 1;
}
memcpy(tmp->str, str, len);
ret = regex_exec_match2(regex, tmp->str, len, 20, pmatch, 0);
lua_pushboolean(L, ret);
lua_newtable(L);
if (ret) {