diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2010-01-02 09:46:16 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2010-01-02 09:46:16 +0000 |
| commit | 7afd9b0c3b6a16397291a64293d547b46f502669 (patch) | |
| tree | 51df04c46d2ad1c10a02b1d69ae7162ac8365825 /epan/dissectors/packet-rpc.c | |
| parent | 02a69c193522d69060008add5b7b77387dad123d (diff) | |
From Jakub Zawadzki:
Cleanup dissector code - use proper memory functions.
https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=4164
svn path=/trunk/; revision=31408
Diffstat (limited to 'epan/dissectors/packet-rpc.c')
| -rw-r--r-- | epan/dissectors/packet-rpc.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/epan/dissectors/packet-rpc.c b/epan/dissectors/packet-rpc.c index 76113a4996..43617d633d 100644 --- a/epan/dissectors/packet-rpc.c +++ b/epan/dissectors/packet-rpc.c @@ -609,9 +609,7 @@ dissect_rpc_opaque_data(tvbuff_t *tvb, int offset, } if (string_data) { - char *tmpstr; - tmpstr = tvb_get_ephemeral_string(tvb, data_offset, string_length_copy); - string_buffer = memcpy(ep_alloc(string_length_copy+1), tmpstr, string_length_copy); + string_buffer = tvb_get_ephemeral_string(tvb, data_offset, string_length_copy); } else { string_buffer = tvb_memcpy(tvb, ep_alloc(string_length_copy+1), data_offset, string_length_copy); } @@ -1663,12 +1661,9 @@ rpc_prog_info_value *rpc_prog = NULL; { 0,NULL,NULL,NULL } }; - NAME=g_malloc(36); - Name=g_malloc(32); - name=g_malloc(32); - g_snprintf(NAME, 36, "Unknown RPC Program:%d",prpc_prog_key->prog); - g_snprintf(Name, 32, "RPC:%d",prpc_prog_key->prog); - g_snprintf(name, 32, "rpc%d",prpc_prog_key->prog); + NAME = g_strdup_printf("Unknown RPC Program:%d",prpc_prog_key->prog); + Name = g_strdup_printf("RPC:%d",prpc_prog_key->prog); + name = g_strdup_printf("rpc%d",prpc_prog_key->prog); proto_rpc_unknown_program = proto_register_protocol(NAME, Name, name); rpc_init_prog(proto_rpc_unknown_program, prpc_prog_key->prog, ett_rpc_unknown_program); |