diff options
| author | Michael Mann <mmann78@netscape.net> | 2012-08-10 02:05:19 +0000 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2012-08-10 02:05:19 +0000 |
| commit | 1d9c472cae6d080cbee2b49f394a6b224772ccbf (patch) | |
| tree | 27006bf9c02a0cc28a68d3cf2438b584662b7363 /epan/dissectors/packet-mbtcp.c | |
| parent | 94b65da5472e5a812d04a61ee6f0b5c35a0b4d3c (diff) | |
convert some simple uses to use ephemeral memory
svn path=/trunk/; revision=44413
Diffstat (limited to 'epan/dissectors/packet-mbtcp.c')
| -rw-r--r-- | epan/dissectors/packet-mbtcp.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/epan/dissectors/packet-mbtcp.c b/epan/dissectors/packet-mbtcp.c index 7316ffa4bd..67c820c5f0 100644 --- a/epan/dissectors/packet-mbtcp.c +++ b/epan/dissectors/packet-mbtcp.c @@ -460,7 +460,6 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) guint32 group_byte_cnt, group_word_cnt; guint8 function_code, exception_code, mei_code, event_code, object_type; guint16 diagnostic_code; - guint8 *object_str; /* Don't need to do anything if there's no tree */ if (tree == NULL) @@ -960,17 +959,15 @@ dissect_modbus(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) if (object_type < 7) { - object_str = tvb_get_string(tvb, payload_start+6+object_index, object_len); - proto_tree_add_string(device_objects_item_tree, hf_modbus_object_str_value, tvb, payload_start+6+object_index, object_len, object_str); - g_free(object_str); - } + proto_tree_add_item(device_objects_item_tree, hf_modbus_object_str_value, tvb, payload_start+6+object_index, object_len, ENC_ASCII|ENC_NA); + } else { if (object_len > 0) proto_tree_add_text(device_objects_item_tree, tvb, payload_start+6+object_index, object_len, "Object Value"); - } + } object_index += object_len; - } + } break; case CANOPEN_REQ_RESP: |