diff options
| author | Michael Mann <mmann78@netscape.net> | 2015-08-25 19:14:59 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2015-08-27 04:34:10 +0000 |
| commit | 0af048b7e40ee92d6702df873cbc515ae2eff9c8 (patch) | |
| tree | f980825d5b37ce5c5d322b149c122b0704edd6ff /epan/dissectors/packet-ssh.c | |
| parent | 374439daa17fe2692746857b920616354ce658e7 (diff) | |
Remove calls of tvb_ensure_length_remaining.
The remaining calls seem to fall into 3 categories:
1. passing it to tvb_find_line_end when -1 (for length) will do.
2. duplicating the checking of tvb_reported_length_remaining, which is already in use near the tvb_ensure_length_remaining call.
3. Those that (probably) need tvb_ensure_capture_length_remaining
Change-Id: I1e77695251e055644bcbbb89f3c181c65d1671ca
Reviewed-on: https://code.wireshark.org/review/10268
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-ssh.c')
| -rw-r--r-- | epan/dissectors/packet-ssh.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/epan/dissectors/packet-ssh.c b/epan/dissectors/packet-ssh.c index e108fbefdb..859e67805c 100644 --- a/epan/dissectors/packet-ssh.c +++ b/epan/dissectors/packet-ssh.c @@ -491,12 +491,12 @@ ssh_dissect_ssh1(tvbuff_t *tvb, packet_info *pinfo, ssh1_tree=proto_tree_add_subtree(tree, tvb, offset, -1, ett_ssh1, NULL, "SSH Version 1"); /* - * We use "tvb_ensure_length_remaining()" to make sure there + * We use "tvb_ensure_captured_length_remaining()" to make sure there * actually *is* data remaining. * * This means we're guaranteed that "remain_length" is positive. */ - remain_length = tvb_ensure_length_remaining(tvb, offset); + remain_length = tvb_ensure_captured_length_remaining(tvb, offset); /* * Can we do reassembly? */ @@ -635,12 +635,12 @@ ssh_dissect_key_exchange(tvbuff_t *tvb, packet_info *pinfo, struct ssh_peer_data *peer_data = &global_data->peer_data[is_response]; /* - * We use "tvb_ensure_length_remaining()" to make sure there + * We use "tvb_ensure_captured_length_remaining()" to make sure there * actually *is* data remaining. * * This means we're guaranteed that "remain_length" is positive. */ - remain_length = tvb_ensure_length_remaining(tvb, offset); + remain_length = tvb_ensure_captured_length_remaining(tvb, offset); /* * Can we do reassembly? */ @@ -896,12 +896,12 @@ ssh_dissect_protocol(tvbuff_t *tvb, packet_info *pinfo, } /* - * We use "tvb_ensure_length_remaining()" to make sure there + * We use "tvb_ensure_captured_length_remaining()" to make sure there * actually *is* data remaining. * * This means we're guaranteed that "remain_length" is positive. */ - remain_length = tvb_ensure_length_remaining(tvb, offset); + remain_length = tvb_ensure_captured_length_remaining(tvb, offset); /*linelen = tvb_find_line_end(tvb, offset, -1, &next_offset, FALSE); */ linelen = tvb_find_guint8(tvb, offset, -1, '\n'); |