diff options
| author | Aditya A <aditya.a@oracle.com> | 2018-07-09 17:25:49 +0530 |
|---|---|---|
| committer | Aditya A <aditya.a@oracle.com> | 2018-07-09 17:25:49 +0530 |
| commit | c54271723c6f2f4e5b77cd8faf91e89412730209 (patch) | |
| tree | 98846d0d72c9d916a60559b0c8f091ab8466e16e /client | |
| parent | 28b052190e377bdfe176e1dc71d268b94c832263 (diff) | |
| download | mariadb-git-c54271723c6f2f4e5b77cd8faf91e89412730209.tar.gz | |
Bug #26275510 BUNDLED ZLIB DOESN'T INCLUDE FIXES FOR SOME VULNERABILITIES
Upgrading the zlib lib to 1.2.11
Diffstat (limited to 'client')
| -rw-r--r-- | client/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | client/mysql.cc | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt index 21b1e084409..ea72e9ce1e8 100644 --- a/client/CMakeLists.txt +++ b/client/CMakeLists.txt @@ -1,4 +1,4 @@ -# Copyright (c) 2006, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2018, Oracle and/or its affiliates. All rights reserved. # # 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 @@ -15,7 +15,6 @@ INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/include - ${ZLIB_INCLUDE_DIR} ${SSL_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/libmysql ${CMAKE_SOURCE_DIR}/regex diff --git a/client/mysql.cc b/client/mysql.cc index bc32a58f37e..8510361a54e 100644 --- a/client/mysql.cc +++ b/client/mysql.cc @@ -2671,7 +2671,7 @@ You can turn off this feature to get a quicker startup with -A\n\n"); mysql_free_result(fields); break; } - field_names[i][num_fields*2]= NULL; + field_names[i][num_fields*2]= '\0'; j=0; while ((sql_field=mysql_fetch_field(fields))) { |