diff options
| author | Guy Harris <guy@alum.mit.edu> | 2014-01-14 05:23:48 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2014-01-14 05:23:48 +0000 |
| commit | 720cfe49c8b185b26d89f424299ab485f7a1b678 (patch) | |
| tree | 13ce262c1c69de8bc68f05fd56afa63178e83869 /epan/dissectors/packet-pvfs2.c | |
| parent | 547efd4dc92a54817fcb7bcc0dc9877cfbc646c8 (diff) | |
Don't cast away constness. In one place, this requires that we use one
pointer while we're filling in a string and then assigning it to a const
pointer when we're done.
Don't use guint16 as a size value; it does no good (it doesn't magically
protect you againt too-long strings), it runs the potential risk of
overflow, it doesn't save time for arithmetic (32-bit or 64-bit
arithmetic may well be faster, and will at least be as fast), and it
doesn't save space (if it fits in a register, you save nothing, and if
it's on the stack, there will probably be padding.
svn path=/trunk/; revision=54764
Diffstat (limited to 'epan/dissectors/packet-pvfs2.c')
| -rw-r--r-- | epan/dissectors/packet-pvfs2.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/epan/dissectors/packet-pvfs2.c b/epan/dissectors/packet-pvfs2.c index 5979510054..2a7cfe38e6 100644 --- a/epan/dissectors/packet-pvfs2.c +++ b/epan/dissectors/packet-pvfs2.c @@ -775,7 +775,7 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, packet_info *pinfo _U_, int hfindex, gboolean fixed_length, guint32 length, - gboolean string_data, char const **string_buffer_ret) + gboolean string_data, const char **string_buffer_ret) { int data_offset; proto_item *string_item = NULL; @@ -888,17 +888,18 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, if (string_length != string_length_copy) { if (string_data) { char *formatted; - guint16 string_buffer_size = 0; + size_t string_buffer_size = 0; + char *string_buffer_temp; formatted = format_text((guint8 *)string_buffer, (int)strlen(string_buffer)); - string_buffer_size = (guint16)strlen(formatted) + 12 + 1; + string_buffer_size = strlen(formatted) + 12 + 1; /* alloc maximum data area */ - string_buffer_print = (char*) wmem_alloc(wmem_packet_scope(), string_buffer_size); + string_buffer_temp = (char*) wmem_alloc(wmem_packet_scope(), string_buffer_size); /* copy over the data */ - g_snprintf((char *)string_buffer_print, string_buffer_size, + g_snprintf(string_buffer_temp, string_buffer_size, "%s<TRUNCATED>", formatted); /* append <TRUNCATED> */ /* This way, we get the TRUNCATED even @@ -908,6 +909,7 @@ dissect_pvfs_opaque_data(tvbuff_t *tvb, int offset, first \0 or at the end (where we put the securing \0). */ + string_buffer_print = string_buffer_temp; } else { string_buffer_print="<DATA><TRUNCATED>"; } @@ -2339,7 +2341,7 @@ dissect_pvfs2_getconfig_response(tvbuff_t *tvb, proto_tree *parent_tree, guint32 total_bytes = 0, total_config_bytes = 0, total_lines = 0; guint32 bytes_processed = 0; guint32 length_remaining = 0; - char *ptr = NULL; + const char *ptr = NULL; proto_item *item = NULL, *config_item = NULL; proto_tree *tree = NULL, *config_tree = NULL; /*guint8 truncated = 0;*/ @@ -2378,7 +2380,7 @@ dissect_pvfs2_getconfig_response(tvbuff_t *tvb, proto_tree *parent_tree, offset += 4; /* Get pointer to server config data */ - ptr = (char *) tvb_get_ptr(tvb, offset, total_config_bytes); + ptr = tvb_get_ptr(tvb, offset, total_config_bytes); /* Check if all data is available */ length_remaining = tvb_length_remaining(tvb, offset); |