diff options
| author | Guy Harris <guy@alum.mit.edu> | 2011-02-18 02:49:46 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2011-02-18 02:49:46 +0000 |
| commit | eef8820ab6e1e50f333f4843952c2c9cf5e2d1fa (patch) | |
| tree | 51e9c852efb3ad2c1b4a1dd0011645531bccad74 /epan/dissectors/packet-iwarp-mpa.c | |
| parent | ed86bc80231074f7a67122c569dc8692f8dc971d (diff) | |
Nope, the __declspec(noreturn) didn't suffice - either abort() isn't
declared as a noreturn function or declaring except_throw() as a
noreturn function isn't good enough.
svn path=/trunk/; revision=35997
Diffstat (limited to 'epan/dissectors/packet-iwarp-mpa.c')
| -rw-r--r-- | epan/dissectors/packet-iwarp-mpa.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-iwarp-mpa.c b/epan/dissectors/packet-iwarp-mpa.c index 0afdad6a9a..f76adcff6c 100644 --- a/epan/dissectors/packet-iwarp-mpa.c +++ b/epan/dissectors/packet-iwarp-mpa.c @@ -826,7 +826,7 @@ dissect_iwarp_mpa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) } /* Markers are used by either the Initiator or the Responder or both. */ - if (state->ini_exp_m_res || state->res_exp_m_ini) { + if ((state->ini_exp_m_res || state->res_exp_m_ini) && endpoint <= MPA_RESPONDER) { /* find the TCP sequence number of the first FPDU */ if (!state->minfo[endpoint].valid) { @@ -844,7 +844,7 @@ dissect_iwarp_mpa(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return FALSE; /* removes Markers if any and prepares new tvbuff for next dissector */ - if (state->minfo[endpoint].valid + if (endpoint <= MPA_RESPONDER && state->minfo[endpoint].valid && number_of_markers(state, tcpinfo, endpoint) > 0) { next_tvb = tvb_new_subset(remove_markers(tvb, pinfo, get_first_marker_offset(state, tcpinfo, endpoint), |