projects
/
profile
/
ivi
/
libwebsockets.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4ffb871
)
More correct handling of inflate result.
64/2864/1
author
David Galeano
<davidgaleano@turbulenz.biz>
Thu, 10 Jan 2013 02:22:47 +0000
(10:22 +0800)
committer
Kevron Rees
<kevron_m_rees@linux.intel.com>
Thu, 7 Mar 2013 21:01:23 +0000
(13:01 -0800)
lib/extension-deflate-frame.c
patch
|
blob
|
history
diff --git
a/lib/extension-deflate-frame.c
b/lib/extension-deflate-frame.c
index
514c6b7
..
a3ff9f0
100644
(file)
--- a/
lib/extension-deflate-frame.c
+++ b/
lib/extension-deflate-frame.c
@@
-142,6
+142,7
@@
int lws_extension_callback_deflate_frame(
n = inflate(&conn->zs_in, Z_SYNC_FLUSH);
switch (n) {
case Z_NEED_DICT:
+ case Z_STREAM_ERROR:
case Z_DATA_ERROR:
case Z_MEM_ERROR:
/*
@@
-153,10
+154,11
@@
int lws_extension_callback_deflate_frame(
return -1;
}
- if (
conn->zs_in.avail_in > 0
) {
+ if (
!conn->zs_in.avail_in
) {
size_t len_so_far = (conn->zs_in.next_out -
(conn->buf_in + LWS_SEND_BUFFER_PRE_PADDING));
unsigned char *new_buf;
+
conn->buf_in_length *= 2;
new_buf = (unsigned char *)
malloc(LWS_SEND_BUFFER_PRE_PADDING +