nghttp2/nghttp2
1
0
Fork 0
mirror of https://github.com/nghttp2/nghttp2.git synced 2026-08-08 01:59:19 +08:00
Code Issues Projects Releases Wiki Activity

Count CONTINUATIONS per its frame header

Browse Source
This commit is contained in:
Tatsuhiro Tsujikawa
2026-07-26 15:25:14 +09:00
parent d5ab3d92da
commit 02788f1e12
2 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/nghttp2_session.c
View File

@@ -6638,10 +6638,6 @@ nghttp2_ssize nghttp2_session_mem_recv2(nghttp2_session *session,
}
#endif /* defined(DEBUGBUILD) */
if (++session->num_continuations > session->max_continuations) {
return NGHTTP2_ERR_TOO_MANY_CONTINUATIONS;
}
readlen = inbound_frame_buf_read(iframe, in, last);
in += readlen;
@@ -6671,6 +6667,10 @@ nghttp2_ssize nghttp2_session_mem_recv2(nghttp2_session *session,
return (nghttp2_ssize)inlen;
}
if (++session->num_continuations > session->max_continuations) {
return NGHTTP2_ERR_TOO_MANY_CONTINUATIONS;
}
/* CONTINUATION won't bear NGHTTP2_PADDED flag */
iframe->frame.hd.flags =

26
tests/nghttp2_session_test.c
View File

@@ -1425,6 +1425,8 @@ void test_nghttp2_session_recv_continuation(void) {
nghttp2_frame_hd cont_hd;
nghttp2_priority_spec pri_spec;
nghttp2_mem *mem;
nghttp2_option *option;
size_t i;
mem = nghttp2_mem_default();
frame_pack_bufs_init(&bufs);
@@ -1491,6 +1493,30 @@ void test_nghttp2_session_recv_continuation(void) {
nghttp2_hd_deflate_free(&deflater);
nghttp2_session_del(session);
/* Too many CONTINUATIONS */
nghttp2_option_new(&option);
nghttp2_option_set_max_continuations(option, 1);
nghttp2_session_server_new2(&session, &callbacks, &ud, option);
ud.header_cb_called = 0;
ud.begin_frame_cb_called = 0;
for (i = 0; i < datalen - cont_hd.length - 1; ++i) {
rv = nghttp2_session_mem_recv2(session, &data[i], 1);
assert_ptrdiff((nghttp2_ssize)1, ==, rv);
}
rv = nghttp2_session_mem_recv2(session, &data[i], 1);
assert_ptrdiff(NGHTTP2_ERR_TOO_MANY_CONTINUATIONS, ==, rv);
assert_int(3, ==, ud.header_cb_called);
assert_int(2, ==, ud.begin_frame_cb_called);
nghttp2_session_del(session);
nghttp2_option_del(option);
/* HEADERS with padding followed by CONTINUATION */
nghttp2_session_server_new(&session, &callbacks, &ud);