diff options
| author | Pascal Quantin <pascal.quantin@gmail.com> | 2017-09-23 21:56:24 +0200 |
|---|---|---|
| committer | Pascal Quantin <pascal.quantin@gmail.com> | 2017-09-23 21:22:12 +0000 |
| commit | a065bb586e2334f5f1f1f4f0a247f309f7a04f46 (patch) | |
| tree | 92c1954281128e0e9f3279bbdcc1b7164e96295a /epan/dissectors/packet-websocket.c | |
| parent | c0fc66c67095f10a4dd4a22f3c5aaadcb7b245c2 (diff) | |
WebSocket: remove useless pointer checks (CID 1418346)
websocket_conv is always allocated
Change-Id: Ic119e22ee37703ccea2a42e53d6616faa0901cf9
Reviewed-on: https://code.wireshark.org/review/23662
Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
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, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-websocket.c b/epan/dissectors/packet-websocket.c index 07b013ec02..afc7619699 100644 --- a/epan/dissectors/packet-websocket.c +++ b/epan/dissectors/packet-websocket.c @@ -340,7 +340,7 @@ dissect_websocket_data_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree } #ifdef HAVE_ZLIB - if (websocket_conv && websocket_conv->permessage_deflate_ok && pmc) { + if (websocket_conv->permessage_deflate_ok && pmc) { tvbuff_t *uncompressed = NULL; gboolean uncompress_ok = FALSE; @@ -571,7 +571,7 @@ dissect_websocket_frame(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi proto_tree_add_item(ws_tree, hf_ws_fin, tvb, 0, 1, ENC_NA); fin = (tvb_get_guint8(tvb, 0) & MASK_WS_FIN) >> 4; proto_tree_add_item(ws_tree, hf_ws_reserved, tvb, 0, 1, ENC_BIG_ENDIAN); - if (websocket_conv && websocket_conv->permessage_deflate) { + if (websocket_conv->permessage_deflate) { /* RSV1 is Per-Message Compressed bit (RFC 7692). */ pmc = !!(tvb_get_guint8(tvb, 0) & MASK_WS_RSV1); proto_tree_add_item(ws_tree, hf_ws_pmc, tvb, 0, 1, ENC_BIG_ENDIAN); |