osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Just for fun, see whether using __declspec(noreturn) on the exception 

routines is sufficient to convince the Visual Studio code analyzer that
REPORT_DISSECTOR_BUG() never returns.  (That would probably require that
abort() be tagged with __declspec(noreturn); let's hope Microsoft did
the right thing there.)

svn path=/trunk/; revision=35996
This commit is contained in:
Guy Harris 2011-02-18 01:28:18 +00:00
parent c223ebe718
commit ed86bc8023
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
epan/dissectors/packet-iwarp-mpa.c
View File

@ -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) && endpoint <= MPA_RESPONDER) {
if (state->ini_exp_m_res || state->res_exp_m_ini) {
/* 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 (endpoint <= MPA_RESPONDER && state->minfo[endpoint].valid
if (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),