stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

timeout check take copies since he may be deleted

Browse source 
Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2016-01-19 22:34:44 +08:00
parent ed6b3961c5
commit 72dba09932
2 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/service.c
View file

@ -379,9 +379,9 @@ lws_service_fd_tsi(struct lws_context *context, struct lws_pollfd *pollfd, int t
lws_sockfd_type our_fd = 0;
struct lws_tokens eff_buf;
unsigned int pending = 0;
struct lws *wsi, *wsi1;
char draining_flow = 0;
int timed_out = 0;
struct lws *wsi;
time_t now;
int n, m;
int more;
@ -411,13 +411,17 @@ lws_service_fd_tsi(struct lws_context *context, struct lws_pollfd *pollfd, int t
wsi = context->timeout_list;
while (wsi) {
if (lws_service_timeout_check(wsi, (unsigned int)now))
/* we have to take copies, because he may be deleted */
wsi1 = wsi->timeout_list;
m = wsi->sock;
if (lws_service_timeout_check(wsi, (unsigned int)now)) {
/* he did time out... */
if (wsi->sock == our_fd)
if (m == our_fd)
/* it was the guy we came to service! */
timed_out = 1;
/* he's gone, no need to mark as handled */
wsi = wsi->timeout_list;
}
wsi = wsi1;
}
}

4
test-server/fuzxy.c
View file

@ -277,8 +277,8 @@ struct fuzxy_rule {
};
struct fuzxy_rule r = {
{ "Host:", "\x0d", " \x0d" },
{ 5, 1, 2 },
{ "Host:", "\x0d", "\xe0\x00\x0d" },
{ 5, 1, 3 },
65536
};