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

BUG/MEDIUM: lua/socket: Length required read doesn't work

Browse Source 
The limit of data read works only if all the data is in the
input buffer. Otherwise (if the data arrive in chunks), the
total amount of data is not taken in acount.

Only the current read data are compared to the expected amout
of data.

This patch must be backported from 1.9 to 1.6
This commit is contained in:
Thierry FOURNIER 2018-05-25 16:27:44 +02:00 committed by Willy Tarreau
parent 9215ffa6b2
commit 8c126c7235
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/hlua.c
View File

@ -1676,6 +1676,7 @@ __LJMP static int hlua_socket_receive_yield(struct lua_State *L, int status, lua
struct stream_interface *si;
struct stream *s;
struct xref *peer;
int missing_bytes;
/* Check if this lua stack is schedulable. */
if (!hlua || !hlua->task)
@ -1745,11 +1746,12 @@ __LJMP static int hlua_socket_receive_yield(struct lua_State *L, int status, lua
if (nblk == 0) /* No data avalaible. */
goto connection_empty;
if (len1 > wanted) {
missing_bytes = wanted - socket->b.n;
if (len1 > missing_bytes) {
nblk = 1;
len1 = wanted;
} if (nblk == 2 && len1 + len2 > wanted)
len2 = wanted - len1;
len1 = missing_bytes;
} if (nblk == 2 && len1 + len2 > missing_bytes)
len2 = missing_bytes - len1;
}
len = len1;
@ -1772,7 +1774,7 @@ __LJMP static int hlua_socket_receive_yield(struct lua_State *L, int status, lua
*/
if (wanted == HLSR_READ_ALL)
goto connection_empty;
else if (wanted >= 0 && len < wanted)
else if (wanted >= 0 && socket->b.n < wanted)
goto connection_empty;
/* Return result. */