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

pmd: do not inflate 0 input length

Browse source 
It generates repeated byte alignments plus EOT sequences
This commit is contained in:
Andy Green 2018-11-21 11:15:45 +08:00
parent 8f2edbe822
commit a1b642f4fe
2 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
lib/roles/ws/ext/extension-permessage-deflate.c
View file

@ -368,28 +368,36 @@ lws_extension_callback_pm_deflate(struct lws_context *context,
ebuf->token = (char *)priv->tx.next_out;
priv->tx.avail_out = 1 << priv->args[PMD_TX_BUF_PWR2];
n = deflate(&priv->tx, Z_SYNC_FLUSH);
if (n == Z_STREAM_ERROR) {
lwsl_ext("%s: Z_STREAM_ERROR\n", __func__);
return -1;
if (priv->tx.avail_in) {
n = deflate(&priv->tx, Z_SYNC_FLUSH);
if (n == Z_STREAM_ERROR) {
lwsl_ext("%s: Z_STREAM_ERROR\n", __func__);
return -1;
}
}
if (priv->tx_held_valid) {
priv->tx_held_valid = 0;
if ((int)priv->tx.avail_out == 1 << priv->args[PMD_TX_BUF_PWR2])
if ((int)priv->tx.avail_out ==
1 << priv->args[PMD_TX_BUF_PWR2])
/*
* we can get a situation he took something in
* We can get a situation he took something in
* but did not generate anything out, at the end
* of a message (eg, next thing he sends is 80
* 00, a zero length FIN, like Autobahn can
* send).
*
* If we have come back as a FIN, we must not
* place the pending trailer 00 00 FF FF, just
* the 1 byte of live data
*/
*(--ebuf->token) = priv->tx_held[0];
else {
/* he generated data, prepend whole pending */
/*
* he generated some data on his own...
* prepend the whole pending
*/
ebuf->token -= 5;
for (n = 0; n < 5; n++)
ebuf->token[n] = priv->tx_held[n];

7
minimal-examples/ws-server/minimal-ws-server-pmd-corner/protocol_lws_minimal.c
View file

@ -222,12 +222,13 @@ callback_minimal(struct lws *wsi, enum lws_callback_reasons reason,
switch (reason) {
case LWS_CALLBACK_ESTABLISHED:
if (lws_hdr_copy(wsi, buf, sizeof(buf), WSI_TOKEN_GET_URI) < 0)
if (lws_hdr_copy(wsi, (char *)buf, sizeof(buf),
WSI_TOKEN_GET_URI) < 0)
return -1;
pss->last = atoi(buf + 1);
pss->last = atoi((char *)buf + 1);
if (pss->last > LWS_ARRAY_SIZE(corner_lengths))
if (pss->last > (int)LWS_ARRAY_SIZE(corner_lengths))
pss->last = 0;
lws_callback_on_writable(wsi);
break;