osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

h223: fix warning related to circuit_id in circuit_chain_lookup 

Fixes a build failure when building the wireshark-git package on Arch
Linux using GCC 7.2.1:

    epan/dissectors/packet-h223.c: In function ‘dissect_mux_sdu_fragment’:
    epan/dissectors/packet-h223.c:207:13: error: variable ‘circuit_id’ might be clobbered by ‘longjmp’ or ‘vfork’ [-Werror=clobbered]

Fixes: v2.5.0rc0-1698-g800b26edbe ("Remove circuit API")
Change-Id: I0b63f692e840e852680467b25ba3c3dfd31392ed
Reviewed-on: https://code.wireshark.org/review/25251
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Peter Wu 2018-01-10 18:44:28 +01:00 committed by Michael Mann
parent 5639b8014a
commit c1719a8bf3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-h223.c
View File

@ -735,11 +735,11 @@ dissect_mux_sdu_fragment(tvbuff_t *volatile next_tvb, packet_info *pinfo,
h223_call_info* call_info, guint16 vc,
gboolean end_of_mux_sdu, endpoint_type orig_etype, guint32 orig_circuit)
{
/* update the circuit details before passing to a subdissector */
guint32 circuit_id = circuit_chain_lookup(call_info, vc);
conversation_create_endpoint_by_id(pinfo, ENDPOINT_H223, circuit_id, 0);
TRY {
/* update the circuit details before passing to a subdissector */
guint32 circuit_id = circuit_chain_lookup(call_info, vc);
conversation_create_endpoint_by_id(pinfo, ENDPOINT_H223, circuit_id, 0);
conversation_t *subcircuit = find_conversation_by_id(pinfo->num, ENDPOINT_H223, circuit_id, 0);
proto_tree *vc_tree;
proto_item *vc_item;