diff options
| author | Joerg Mayer <jmayer@loplof.de> | 2015-05-01 02:40:17 +0200 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2015-05-01 00:45:15 +0000 |
| commit | cbeaf034befc438be4f984f8121ab4b141165ec5 (patch) | |
| tree | abcdee9bc786e18114cd5659038efe311550a7e1 /epan/nghttp2 | |
| parent | 6fa0a4c87ec4e2d74a23616af51d77f582d1155f (diff) | |
Revert "Fix warning:"
This reverts commit 39a31c3205ed1f0691f5e55174abe84653bcf7b0.
rv is used in an assert, thus breaking debug builds.
Change-Id: Ide9c287a9b6bfe07554a9429d3d216266d63c017
Reviewed-on: https://code.wireshark.org/review/8259
Reviewed-by: Jörg Mayer <jmayer@loplof.de>
Diffstat (limited to 'epan/nghttp2')
| -rw-r--r-- | epan/nghttp2/nghttp2_hd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/epan/nghttp2/nghttp2_hd.c b/epan/nghttp2/nghttp2_hd.c index b924d05a00..2f0c00228a 100644 --- a/epan/nghttp2/nghttp2_hd.c +++ b/epan/nghttp2/nghttp2_hd.c @@ -1733,6 +1733,7 @@ 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, nghttp2_nv *nv, nghttp2_hd_entry *ent_name) { + size_t rv; size_t buflen; uint8_t *buf; nghttp2_mem *mem; @@ -1750,7 +1751,7 @@ static int hd_inflate_remove_bufs_with_name(nghttp2_hd_inflater *inflater, /* Copy including terminal NULL */ memcpy(buf, ent_name->nv.name, ent_name->nv.namelen + 1); - nghttp2_bufs_remove_copy(&inflater->nvbufs, + rv = nghttp2_bufs_remove_copy(&inflater->nvbufs, buf + ent_name->nv.namelen + 1); assert(ent_name->nv.namelen + 1 + rv == buflen); |