diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-09-21 21:52:35 +0000 |
|---|---|---|
| committer | Wireshark GitLab Utility <gerald+gitlab-utility@wireshark.org> | 2020-09-22 05:32:52 +0000 |
| commit | 1e2e32f8ab1c2bdeceab2b05069101008470c310 (patch) | |
| tree | 48e50f5005a11ef5fde9e9e3f324525ec76d3820 /epan/dissectors/packet-mysql.c | |
| parent | 2b3e666a16ce9236ab73a91e2d42ce9133713cec (diff) | |
MySQL: Fixup connection data initialization.
Just use wmem_new0 instead of trying to initialize struct members
by hand. Closes #16854.
Diffstat (limited to 'epan/dissectors/packet-mysql.c')
| -rw-r--r-- | epan/dissectors/packet-mysql.c | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/epan/dissectors/packet-mysql.c b/epan/dissectors/packet-mysql.c index 445d728463..9adccf896a 100644 --- a/epan/dissectors/packet-mysql.c +++ b/epan/dissectors/packet-mysql.c @@ -2834,20 +2834,8 @@ dissect_mysql_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* dat /* get associated state information, create if necessary */ conn_data= (mysql_conn_data_t *)conversation_get_proto_data(conversation, proto_mysql); if (!conn_data) { - conn_data= wmem_new(wmem_file_scope(), mysql_conn_data_t); - conn_data->srv_caps= 0; - conn_data->clnt_caps= 0; - conn_data->clnt_caps_ext= 0; - conn_data->state= UNDEFINED; - conn_data->stmts= wmem_tree_new(wmem_file_scope()); -#ifdef CTDEBUG - conn_data->generation= 0; -#endif - conn_data->major_version= 0; - conn_data->frame_start_ssl= 0; - conn_data->frame_start_compressed= 0; - conn_data->compressed_state= MYSQL_COMPRESS_NONE; - conn_data->is_mariadb_client = 0; + conn_data = wmem_new0(wmem_file_scope(), mysql_conn_data_t); + conn_data->stmts = wmem_tree_new(wmem_file_scope()); conversation_add_proto_data(conversation, proto_mysql, conn_data); } |