summaryrefslogtreecommitdiff
path: root/sql/net_serv.cc
diff options
context:
space:
mode:
authorMarko Mäkelä <marko.makela@mariadb.com>2020-03-28 21:01:10 +0200
committerMarko Mäkelä <marko.makela@mariadb.com>2020-03-28 21:20:29 +0200
commit3a1c89718427a161559003dc6d55bf2eceafba09 (patch)
tree1e9719b1b3a7dd1aa4543edaf6aa383ea51ff68a /sql/net_serv.cc
parente129555462e3464e5274c5d5bab19defa1592d3a (diff)
downloadmariadb-git-3a1c89718427a161559003dc6d55bf2eceafba09.tar.gz
my_net_init(): Avoid reading uninitialized data in my_net_local_init()
Diffstat (limited to 'sql/net_serv.cc')
-rw-r--r--sql/net_serv.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc
index 55ae19237ac..3e173a47f02 100644
--- a/sql/net_serv.cc
+++ b/sql/net_serv.cc
@@ -1,5 +1,5 @@
/* Copyright (c) 2000, 2016, Oracle and/or its affiliates.
- Copyright (c) 2012, 2018, MariaDB Corporation.
+ Copyright (c) 2012, 2020, MariaDB Corporation.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -141,6 +141,8 @@ my_bool my_net_init(NET *net, Vio *vio, void *thd, uint my_flags)
DBUG_ENTER("my_net_init");
DBUG_PRINT("enter", ("my_flags: %u", my_flags));
net->vio = vio;
+ net->read_timeout= 0;
+ net->write_timeout= 0;
my_net_local_init(net); /* Set some limits */
if (net_allocate_new_packet(net, thd, my_flags))