diff options
author | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:17:16 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2014-06-19 17:23:41 +0000 |
commit | daa70feddcd3ff35f2771b0b8c4e1be8e5a4e7ea (patch) | |
tree | cc9a1f72f6c69ebd216dd795733f23a51963bbaa /epan/dissectors/packet-http.c | |
parent | 46a808acf4e8c87b61169bfac00799857b38f1f0 (diff) |
Revert "Fixup: tvb_ensure_length_remaining -> tvb_ensure_captured_length_remaining"
See https://www.wireshark.org/lists/wireshark-dev/201406/msg00131.html
This reverts commit 021e7afc9fcba09094d0e2143cc434a34e3b09dc.
Change-Id: I0640eabce5ce8c4ff3a88ebf848b499f8bb8ed2f
Reviewed-on: https://code.wireshark.org/review/2429
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-http.c')
-rw-r--r-- | epan/dissectors/packet-http.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 05cbd2f97c..32bf7163aa 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -733,7 +733,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, * "tvb_get_ptr()" call won't throw an exception. */ first_linelen = tvb_find_line_end(tvb, offset, - tvb_ensure_captured_length_remaining(tvb, offset), &next_offset, + tvb_ensure_length_remaining(tvb, offset), &next_offset, TRUE); if (first_linelen == -1) { @@ -817,7 +817,7 @@ dissect_http_message(tvbuff_t *tvb, int offset, packet_info *pinfo, * we do on it? */ linelen = tvb_find_line_end(tvb, offset, - tvb_ensure_captured_length_remaining(tvb, offset), &next_offset, + tvb_ensure_length_remaining(tvb, offset), &next_offset, FALSE); if (linelen < 0) return -1; @@ -3273,7 +3273,7 @@ dissect_message_http(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) subtree = proto_item_add_subtree(ti, ett_message_http); while (tvb_reported_length_remaining(tvb, offset) > 0) { len = tvb_find_line_end(tvb, offset, - tvb_ensure_captured_length_remaining(tvb, offset), + tvb_ensure_length_remaining(tvb, offset), &next_offset, FALSE); if (len == -1) break; |