Mirrors/libwebsockets
1
0
Fork 0
mirror of https://github.com/warmcat/libwebsockets.git synced 2025-03-23 00:00:06 +01:00
Code Issues Releases Wiki Activity

coverity 188320: hide supposed dead code from coverity with NO_EXTENSIONS

Browse source
This commit is contained in:
Andy Green 2018-03-19 08:27:31 +08:00
parent e157fcfe37
commit 95f8328ffc
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/server/parsers.c
View file

@ -1250,8 +1250,11 @@ int
lws_rx_sm(struct lws *wsi, unsigned char c) lws_rx_sm(struct lws *wsi, unsigned char c)
{ {
int callback_action = LWS_CALLBACK_RECEIVE; int callback_action = LWS_CALLBACK_RECEIVE;
int ret = 0, n, rx_draining_ext = 0; int ret = 0, rx_draining_ext = 0;
struct lws_tokens eff_buf; struct lws_tokens eff_buf;
#if !defined(LWS_NO_EXTENSIONS)
int n;
#endif
eff_buf.token = NULL; eff_buf.token = NULL;
eff_buf.token_len = 0; eff_buf.token_len = 0;
@ -1700,13 +1703,15 @@ drain_extension:
if (wsi->state == LWSS_RETURNED_CLOSE_ALREADY || if (wsi->state == LWSS_RETURNED_CLOSE_ALREADY ||
wsi->state == LWSS_AWAITING_CLOSE_ACK) wsi->state == LWSS_AWAITING_CLOSE_ACK)
goto already_done; goto already_done;
#if !defined(LWS_NO_EXTENSIONS)
n = lws_ext_cb_active(wsi, LWS_EXT_CB_PAYLOAD_RX, &eff_buf, 0); n = lws_ext_cb_active(wsi, LWS_EXT_CB_PAYLOAD_RX, &eff_buf, 0);
#endif
/* /*
* eff_buf may be pointing somewhere completely different now, * eff_buf may be pointing somewhere completely different now,
* it's the output * it's the output
*/ */
wsi->ws->first_fragment = 0; wsi->ws->first_fragment = 0;
#if !defined(LWS_NO_EXTENSIONS)
if (n < 0) { if (n < 0) {
/* /*
* we may rely on this to get RX, just drop connection * we may rely on this to get RX, just drop connection
@ -1714,11 +1719,15 @@ drain_extension:
wsi->socket_is_permanently_unusable = 1; wsi->socket_is_permanently_unusable = 1;
return -1; return -1;
} }
#endif
if (rx_draining_ext && eff_buf.token_len == 0) if (rx_draining_ext && eff_buf.token_len == 0)
goto already_done; goto already_done;
if (n && eff_buf.token_len) if (
#if !defined(LWS_NO_EXTENSIONS)
n &&
#endif
eff_buf.token_len)
/* extension had more... main loop will come back */ /* extension had more... main loop will come back */
lws_add_wsi_to_draining_ext_list(wsi); lws_add_wsi_to_draining_ext_list(wsi);
else else