diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-19 17:09:06 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-08-19 17:09:59 +0300 |
commit | e7fda5db07b686082af6f74e561600531e2486eb (patch) | |
tree | 03f34edef885396f75683379a5fa770c8b17d7d6 | |
parent | dc91372de3ab4b9b849a0710b4b086619d87b6cd (diff) | |
download | mariadb-git-e7fda5db07b686082af6f74e561600531e2486eb.tar.gz |
MDEV-20377: Fix uninitialized memory in mysqltest
-rw-r--r-- | client/mysqltest.cc | 3 | ||||
-rw-r--r-- | mysql-test/lib/My/SafeProcess/safe_process.cc | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index ad868722dfb..60a203ccedd 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2009, 2017, MariaDB + Copyright (c) 2009, 2019, MariaDB 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 @@ -1693,6 +1693,7 @@ void abort_not_supported_test(const char *fmt, ...) cur_file->file_name, cur_file->lineno); char buff[DIE_BUFF_SIZE]; + buff[0] = '\0'; print_file_stack(buff, buff + sizeof(buff)); fprintf(stderr, "%s", buff); diff --git a/mysql-test/lib/My/SafeProcess/safe_process.cc b/mysql-test/lib/My/SafeProcess/safe_process.cc index a63c1565228..13d09198a0c 100644 --- a/mysql-test/lib/My/SafeProcess/safe_process.cc +++ b/mysql-test/lib/My/SafeProcess/safe_process.cc @@ -1,4 +1,5 @@ /* Copyright (c) 2008, 2012, Oracle and/or its affiliates + Copyright (c) 2019, 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 @@ -169,6 +170,7 @@ int main(int argc, char* const argv[] ) sigemptyset(&sa.sa_mask); sa_abort.sa_handler= handle_abort; + sa_abort.sa_flags= 0; sigemptyset(&sa_abort.sa_mask); /* Install signal handlers */ sigaction(SIGTERM, &sa,NULL); |