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

Fix bug that nghttp2_session_set_next_stream_id accepts invalid stream_id

This commit is contained in:
Tatsuhiro Tsujikawa 2015-04-17 00:12:47 +09:00
parent e23225689f
commit 7323d4c639
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/includes/nghttp2/nghttp2.h
View File

@ -2707,7 +2707,9 @@ NGHTTP2_EXTERN uint32_t
* *
* :enum:`NGHTTP2_ERR_INVALID_ARGUMENT` * :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
* The |next_stream_id| is strictly less than the value * The |next_stream_id| is strictly less than the value
* `nghttp2_session_get_next_stream_id()` returns. * `nghttp2_session_get_next_stream_id()` returns; or
* |next_stream_id| is invalid (e.g., even integer for client, or
* odd integer for server).
*/ */
NGHTTP2_EXTERN int nghttp2_session_set_next_stream_id(nghttp2_session *session, NGHTTP2_EXTERN int nghttp2_session_set_next_stream_id(nghttp2_session *session,
int32_t next_stream_id); int32_t next_stream_id);

10
lib/nghttp2_session.c
View File

@ -6622,11 +6622,19 @@ int nghttp2_session_consume_stream(nghttp2_session *session, int32_t stream_id,
int nghttp2_session_set_next_stream_id(nghttp2_session *session, int nghttp2_session_set_next_stream_id(nghttp2_session *session,
int32_t next_stream_id) { int32_t next_stream_id) {
if (next_stream_id < 0 || if (next_stream_id <= 0 ||
session->next_stream_id > (uint32_t)next_stream_id) { session->next_stream_id > (uint32_t)next_stream_id) {
return NGHTTP2_ERR_INVALID_ARGUMENT; return NGHTTP2_ERR_INVALID_ARGUMENT;
} }
if (session->server) {
if (next_stream_id % 2) {
return NGHTTP2_ERR_INVALID_ARGUMENT;
}
} else if (next_stream_id % 2 == 0) {
return NGHTTP2_ERR_INVALID_ARGUMENT;
}
session->next_stream_id = next_stream_id; session->next_stream_id = next_stream_id;
return 0; return 0;
} }