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

Use datamax if buffer reallocation failed

This commit is contained in:
Tatsuhiro Tsujikawa 2014-08-25 22:46:55 +09:00
parent 565c635e9b
commit 577512f2ca
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/nghttp2_session.c
View File

@ -5665,17 +5665,22 @@ int nghttp2_session_pack_data(nghttp2_session *session,
if(payloadlen <= 0) { if(payloadlen <= 0) {
return NGHTTP2_ERR_CALLBACK_FAILURE; return NGHTTP2_ERR_CALLBACK_FAILURE;
} else if(payloadlen > nghttp2_buf_avail(buf)) { }
// Resize the current buffer(s)
nghttp2_bufs_free(&session->aob.framebufs); if(payloadlen > nghttp2_buf_avail(buf)) {
/* Resize the current buffer(s). The reason why we do +1 for
buffer size is for possible padding field. */
rv = nghttp2_bufs_realloc(&session->aob.framebufs,
NGHTTP2_FRAME_HDLEN + 1 + payloadlen);
// The reason why we do +1 for buffer size is for possible padding field.
rv = nghttp2_bufs_init3(&session->aob.framebufs,
NGHTTP2_FRAME_HDLEN + 1 + payloadlen,
NGHTTP2_FRAMEBUF_MAX_NUM,
1, NGHTTP2_FRAME_HDLEN + 1);
if(rv != 0) { if(rv != 0) {
return rv; DEBUGF(fprintf(stderr, "send: realloc buffer failed rv=%d", rv));
/* If reallocation failed, old buffers are still in tact. So
use safe limit. */
payloadlen = datamax;
DEBUGF(fprintf(stderr, "send: use safe limit payloadlen=%zu",
payloadlen));
} }
} }
datamax = (size_t) payloadlen; datamax = (size_t) payloadlen;