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

msgpack: fix return value for map and array. 

Change-Id: I438b9ed310ca9d5553a00c7d0b633d8597b4f5bc
Reviewed-on: https://code.wireshark.org/review/28881
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Dario Lombardo 2018-07-29 14:48:24 +02:00 committed by Anders Broman
parent 7c6ca703ef
commit 75ba65253f
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/dissectors/packet-msgpack.c
View File

@ -168,7 +168,8 @@ static void dissect_msgpack_map(tvbuff_t* tvb, packet_info* pinfo, proto_tree* t
proto_item_append_text(map_subtree, " %s", *value);
}
*value = "";
if (value)
*value = label;
}
static void dissect_msgpack_array(tvbuff_t* tvb, packet_info* pinfo, proto_tree* tree, guint8 type, void* data, int* offset, char** value)
@ -189,6 +190,9 @@ static void dissect_msgpack_array(tvbuff_t* tvb, packet_info* pinfo, proto_tree*
for (i = 0; i < len; i++) {
dissect_msgpack_object(tvb, pinfo, subtree, data, offset, value);
}
if (value)
*value = label;
}
static void dissect_msgpack_string(tvbuff_t* tvb, proto_tree* tree, int type, void* data, int* offset, char** value)