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

rv is only used in an assert. 

The assert only evaluates to code if NDEBUG is undefined. Protect rv and its use accordingly

Issue reported by Joerg Mayer
https://code.wireshark.org/review/8260
This commit is contained in:
Alexis La Goutte 2015-05-07 15:20:15 +02:00
parent 73e79130d1
commit 1241c951d6
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/nghttp2_hd.c
View File

@ -1729,7 +1729,9 @@ static int hd_inflate_remove_bufs(nghttp2_hd_inflater *inflater, nghttp2_nv *nv,
static int hd_inflate_remove_bufs_with_name(nghttp2_hd_inflater *inflater, static int hd_inflate_remove_bufs_with_name(nghttp2_hd_inflater *inflater,
nghttp2_nv *nv, nghttp2_nv *nv,
nghttp2_hd_entry *ent_name) { nghttp2_hd_entry *ent_name) {
#ifndef NDEBUG
size_t rv; size_t rv;
#endif
size_t buflen; size_t buflen;
uint8_t *buf; uint8_t *buf;
nghttp2_mem *mem; nghttp2_mem *mem;
@ -1747,7 +1749,10 @@ static int hd_inflate_remove_bufs_with_name(nghttp2_hd_inflater *inflater,
/* Copy including terminal NULL */ /* Copy including terminal NULL */
memcpy(buf, ent_name->nv.name, ent_name->nv.namelen + 1); memcpy(buf, ent_name->nv.name, ent_name->nv.namelen + 1);
rv = nghttp2_bufs_remove_copy(&inflater->nvbufs, #ifndef NDEBUG
rv =
#endif
nghttp2_bufs_remove_copy(&inflater->nvbufs,
buf + ent_name->nv.namelen + 1); buf + ent_name->nv.namelen + 1);
assert(ent_name->nv.namelen + 1 + rv == buflen); assert(ent_name->nv.namelen + 1 + rv == buflen);