walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Fixed 2 bugs: incorrect DATA frame length and data payload is zero-cleard.

This commit is contained in:
Tatsuhiro Tsujikawa 2012-02-07 02:04:00 +09:00
parent a14b9a1ba6
commit 5012f177d0
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/spdylay_session.c
View File

@ -767,6 +767,7 @@ static int spdylay_session_after_frame_sent(spdylay_session *session)
spdylay_active_outbound_item_reset(&session->aob); spdylay_active_outbound_item_reset(&session->aob);
return r; return r;
} }
session->aob.framebuflen = r;
session->aob.framebufoff = 0; session->aob.framebufoff = 0;
} else { } else {
r = spdylay_pq_push(&session->ob_pq, session->aob.item); r = spdylay_pq_push(&session->ob_pq, session->aob.item);
@ -1628,8 +1629,9 @@ ssize_t spdylay_session_pack_data(spdylay_session *session,
frame); frame);
if(framelen < 0) { if(framelen < 0) {
free(framebuf); free(framebuf);
} } else {
*buf_ptr = framebuf; *buf_ptr = framebuf;
}
return framelen; return framelen;
} }
@ -1647,9 +1649,9 @@ ssize_t spdylay_session_pack_data_overwrite(spdylay_session *session,
} else if(len < r) { } else if(len < r) {
return SPDYLAY_ERR_CALLBACK_FAILURE; return SPDYLAY_ERR_CALLBACK_FAILURE;
} }
memset(buf, 0, len); memset(buf, 0, SPDYLAY_HEAD_LEN);
spdylay_put_uint32be(&buf[0], frame->stream_id); spdylay_put_uint32be(&buf[0], frame->stream_id);
spdylay_put_uint32be(&buf[4], 8+r); spdylay_put_uint32be(&buf[4], r);
if(eof) { if(eof) {
flags |= SPDYLAY_FLAG_FIN; flags |= SPDYLAY_FLAG_FIN;
} }