diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-09-19 22:28:55 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-09-19 20:36:32 +0000 |
| commit | 4930772178a779d57d694b71b5786ff4ca792c3c (patch) | |
| tree | a64220a1546f084fde0555df09588c97ada2ec1b /epan/dissectors/packet-websocket.c | |
| parent | 941fac1be27fa81737446bed9de0dfba526752ac (diff) | |
WebSocket: check websocket_extensions pointer validity
Bug: 14075
Change-Id: I825a30e5b8bfa57a020ae208a3a6ee67ee1a58d3
Reviewed-on: https://code.wireshark.org/review/23622
Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-websocket.c')
| -rw-r--r-- | epan/dissectors/packet-websocket.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index c1e41e8605..07b013ec02 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -536,7 +536,9 @@ dissect_websocket_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi if (http_conv) { websocket_conv->subprotocol = http_conv->websocket_protocol; websocket_conv->server_port = http_conv->server_port; - websocket_parse_extensions(websocket_conv, http_conv->websocket_extensions); + if ( http_conv->websocket_extensions) { + websocket_parse_extensions(websocket_conv, http_conv->websocket_extensions); + } } conversation_add_proto_data(conv, proto_websocket, websocket_conv); |