aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-websocket.c
diff options
context:
space:
mode:
authorAnders Broman <anders.broman@ericsson.com>2013-03-04 07:25:57 +0000
committerAnders Broman <anders.broman@ericsson.com>2013-03-04 07:25:57 +0000
commite12ac388b0d171d5940cdc40ecedfbc2580893b3 (patch)
tree68dd055673f9f175a3570b46e5f5e100adfe5ffb /epan/dissectors/packet-websocket.c
parent67d195080b262ffa35bc7b1290f3ab5b16139e71 (diff)
Use explicit casts.
svn path=/trunk/; revision=48048
Diffstat (limited to 'epan/dissectors/packet-websocket.c')
-rw-r--r--epan/dissectors/packet-websocket.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c
index 2ea5816517..c07bb6277e 100644
--- a/epan/dissectors/packet-websocket.c
+++ b/epan/dissectors/packet-websocket.c
@@ -126,7 +126,7 @@ tvb_unmasked(tvbuff_t *tvb, const guint offset, guint payload_length, const guin
const guint8 *data_mask;
guint unmasked_length = payload_length > MAX_UNMASKED_LEN ? MAX_UNMASKED_LEN : payload_length;
- data_unmask = g_malloc(unmasked_length);
+ data_unmask = (gchar *)g_malloc(unmasked_length);
data_mask = tvb_get_ptr(tvb, offset, unmasked_length);
/* Unmasked(XOR) Data... */
for(i=0; i < unmasked_length; i++){