Bug #26826272: REMOVE GCC 8 WARNINGS [noclose server]

This patch fixes all -Werror warnings of server code built in optimized mode.
It also removes _snprintf on windows, snprintf is now C99 standard compliant.

Change-Id: Iafa5aa8d968d97bd2e7a3e39dda64bc308a3de31

Author: Tor Didriksen

client/mysqlbinlog.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 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, version 2.0,
@@ -104,7 +104,7 @@ static bool rewrite_db(char **buf, ulong *buf_size, uint offset_db,
             *buf_size - (offset_db + old_db_len));
 
   // Write new_db and new_db_len.
-  strncpy((*buf) + offset_db, new_db, new_db_len);
+  memcpy((*buf) + offset_db, new_db, new_db_len);
   (*buf)[offset_len] = (char)new_db_len;
 
   // Update event length in header.

client/mysqlslap.cc

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 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, version 2.0,
@@ -122,7 +122,6 @@ database, then reporting the timing of each stage.
 #ifdef _WIN32
 #define srandom srand
 #define random rand
-#define snprintf _snprintf
 #endif
 
 #if defined(_WIN32)

client/mysqltest.cc

@@ -3696,8 +3696,9 @@ static void do_mkdir(struct st_command *command) {
 void do_force_rmdir(struct st_command *command, DYNAMIC_STRING *ds_dirname) {
   DBUG_ENTER("do_force_rmdir");
 
-  char dir_name[FN_REFLEN];
-  strncpy(dir_name, ds_dirname->str, sizeof(dir_name));
+  char dir_name[FN_REFLEN + 1];
+  strncpy(dir_name, ds_dirname->str, sizeof(dir_name) - 1);
+  dir_name[FN_REFLEN] = '\0';
 
   /* Note that my_dir sorts the list if not given any flags */
   MY_DIR *dir_info = my_dir(ds_dirname->str, MYF(MY_DONT_SORT | MY_WANT_STAT));

libbinlogevents/src/control_events.cpp

@@ -91,7 +91,8 @@ Format_description_event::Format_description_event(uint8_t binlog_ver,
        help in getting rid of the valgrind errors.
       */
       memset(server_version, 0, ST_SERVER_VER_LEN);
-      strncpy(server_version, server_ver, ST_SERVER_VER_LEN);
+      snprintf(server_version, ST_SERVER_VER_LEN, "%.*s", ST_SERVER_VER_LEN - 1,
+               server_ver);
       if (binary_log_debug::debug_pretend_version_50034_in_binlog)
         strcpy(server_version, "5.0.34");
       common_header_len = LOG_EVENT_HEADER_LEN;

mysql-test/lib/My/SafeProcess/safe_kill_win.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 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, version 2.0,
@@ -48,8 +48,8 @@ int main(int argc, const char **argv) {
   }
   pid = atoi(argv[1]);
 
-  _snprintf(safe_process_name, sizeof(safe_process_name), "safe_process[%d]",
-            pid);
+  snprintf(safe_process_name, sizeof(safe_process_name), "safe_process[%d]",
+           pid);
 
   /* Open the event to signal */
   while ((shutdown_event = OpenEvent(EVENT_MODIFY_STATE, FALSE,

mysql-test/lib/My/SafeProcess/safe_process_win.cc

@@ -173,10 +173,10 @@ int main(int argc, const char **argv) {
         arg = argv[j];
         if (strchr(arg, ' ') && arg[0] != '\"' && arg[strlen(arg)] != '\"') {
           /* Quote arg that contains spaces and are not quoted already */
-          to += _snprintf(to, child_args + sizeof(child_args) - to, "\"%s\" ",
-                          arg);
+          to += snprintf(to, child_args + sizeof(child_args) - to, "\"%s\" ",
+                         arg);
         } else {
-          to += _snprintf(to, child_args + sizeof(child_args) - to, "%s ", arg);
+          to += snprintf(to, child_args + sizeof(child_args) - to, "%s ", arg);
         }
       }
       break;

mysys/stacktrace.cc

@@ -485,9 +485,9 @@ void my_write_core(int unused) {
     // representation of DWORD value + 4 bytes for .dmp suffix +
     // 1 byte for termitated \0. Such size of output buffer guarantees
     // that there is enough space to place a result of string formatting
-    // performed by _snprintf().
-    _snprintf(dump_fname, sizeof(dump_fname), "%s.%u.dmp", module_name,
-              GetCurrentProcessId());
+    // performed by snprintf().
+    snprintf(dump_fname, sizeof(dump_fname), "%s.%u.dmp", module_name,
+             GetCurrentProcessId());
   }
   my_create_minidump(dump_fname, 0, 0);
 }

plugin/group_replication/include/recovery_state_transfer.h

@@ -109,37 +109,37 @@ class Recovery_state_transfer {
 
   /** Set a SSL trusted certificate authorities file */
   void set_recovery_ssl_ca(const char *ssl_ca) {
-    (void)strncpy(recovery_ssl_ca, ssl_ca, strlen(ssl_ca) + 1);
+    memcpy(recovery_ssl_ca, ssl_ca, strlen(ssl_ca) + 1);
   }
 
   /** Set a folder with SSL trusted CA files */
   void set_recovery_ssl_capath(const char *ssl_capath) {
-    (void)strncpy(recovery_ssl_capath, ssl_capath, strlen(ssl_capath) + 1);
+    memcpy(recovery_ssl_capath, ssl_capath, strlen(ssl_capath) + 1);
   }
 
   /** Set a SSL certificate for connection */
   void set_recovery_ssl_cert(const char *ssl_cert) {
-    (void)strncpy(recovery_ssl_cert, ssl_cert, strlen(ssl_cert) + 1);
+    memcpy(recovery_ssl_cert, ssl_cert, strlen(ssl_cert) + 1);
   }
 
   /** Set a SSL ciphers to be used */
   void set_recovery_ssl_cipher(const char *ssl_cipher) {
-    (void)strncpy(recovery_ssl_cipher, ssl_cipher, strlen(ssl_cipher) + 1);
+    memcpy(recovery_ssl_cipher, ssl_cipher, strlen(ssl_cipher) + 1);
   }
 
   /** Set a SSL key for connections */
   void set_recovery_ssl_key(const char *ssl_key) {
-    (void)strncpy(recovery_ssl_key, ssl_key, strlen(ssl_key) + 1);
+    memcpy(recovery_ssl_key, ssl_key, strlen(ssl_key) + 1);
   }
 
   /** Set a SSL revocation list file*/
   void set_recovery_ssl_crl(const char *ssl_crl) {
-    (void)strncpy(recovery_ssl_crl, ssl_crl, strlen(ssl_crl) + 1);
+    memcpy(recovery_ssl_crl, ssl_crl, strlen(ssl_crl) + 1);
   }
 
   /** Set a folder with SSL revocation list files*/
   void set_recovery_ssl_crlpath(const char *ssl_crlpath) {
-    (void)strncpy(recovery_ssl_crlpath, ssl_crlpath, strlen(ssl_crlpath) + 1);
+    memcpy(recovery_ssl_crlpath, ssl_crlpath, strlen(ssl_crlpath) + 1);
   }
 
   /** Set if recovery shall compare the used hostname against the certificate */
@@ -159,8 +159,8 @@ class Recovery_state_transfer {
   /** Set a public key file*/
   void set_recovery_public_key_path(const char *public_key_path) {
     if (public_key_path != NULL) {
-      (void)strncpy(recovery_public_key_path, public_key_path,
-                    strlen(public_key_path) + 1);
+      memcpy(recovery_public_key_path, public_key_path,
+             strlen(public_key_path) + 1);
     }
   }
 

plugin/group_replication/src/plugin.cc

@@ -994,7 +994,7 @@ int terminate_plugin_modules(bool flag_stop_async_channel,
 
           *error_message =
               (char *)my_malloc(PSI_NOT_INSTRUMENTED, err_len + 1, MYF(0));
-          strncpy(*error_message, err_tmp_arr, err_len);
+          memcpy(*error_message, err_tmp_arr, err_len + 1);
         } else {
           char err_tmp_arr[] =
               "Error stopping all replication channels while"

plugin/password_validation/validate_password.cc

@@ -1,4 +1,4 @@
-/* Copyright (c) 2012, 2017, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2012, 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, version 2.0,
@@ -136,7 +136,7 @@ static bool check_user_name;
 static void dictionary_activate(set_type *dict_words) {
   time_t start_time;
   struct tm tm;
-  char timebuf[20]; /* "YYYY-MM-DD HH:MM:SS" */
+  char timebuf[20 * 2]; /* "YYYY-MM-DD HH:MM:SS" */
   char *new_ts;
 
   /* fetch the start time */

plugin/test_service_sql_api/test_session_detach.cc

@@ -253,34 +253,31 @@ static int sql_get_null(void *ctx) {
 }
 
 static int sql_get_integer(void *ctx, longlong value) {
-  char buffer[1024];
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
   DBUG_ENTER("sql_get_integer");
   uint row = pctx->num_rows;
   uint col = pctx->current_col;
   pctx->current_col++;
 
-  size_t len = snprintf(buffer, sizeof(buffer), "%lld", value);
-
-  strncpy(pctx->sql_str_value[row][col], buffer, len);
+  size_t len = snprintf(pctx->sql_str_value[row][col],
+                        sizeof(pctx->sql_str_value[row][col]), "%lld", value);
   pctx->sql_str_len[row][col] = len;
   pctx->sql_int_value[row][col] = value;
 
   DBUG_RETURN(false);
 }
 
 static int sql_get_longlong(void *ctx, longlong value, uint is_unsigned) {
-  char buffer[1024];
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
   DBUG_ENTER("sql_get_longlong");
   uint row = pctx->num_rows;
   uint col = pctx->current_col;
   pctx->current_col++;
 
-  size_t len =
-      snprintf(buffer, sizeof(buffer), is_unsigned ? "%llu" : "%lld", value);
+  size_t len = snprintf(pctx->sql_str_value[row][col],
+                        sizeof(pctx->sql_str_value[row][col]),
+                        is_unsigned ? "%llu" : "%lld", value);
 
-  strncpy(pctx->sql_str_value[row][col], buffer, len);
   pctx->sql_str_len[row][col] = len;
   pctx->sql_longlong_value[row][col] = value;
   pctx->sql_is_unsigned[row][col] = is_unsigned;
@@ -289,19 +286,16 @@ static int sql_get_longlong(void *ctx, longlong value, uint is_unsigned) {
 }
 
 static int sql_get_decimal(void *ctx, const decimal_t *value) {
-  char buffer[1024];
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
   DBUG_ENTER("sql_get_decimal");
   uint row = pctx->num_rows;
   uint col = pctx->current_col;
   pctx->current_col++;
 
-  size_t len = snprintf(buffer, sizeof(buffer), "%s%d.%d(%d)[%s]",
-                        value->sign ? "+" : "-", value->intg, value->frac,
-                        value->len, (char *)value->buf);
-
-  strncpy(pctx->sql_str_value[row][col], buffer, len);
-
+  size_t len = snprintf(pctx->sql_str_value[row][col],
+                        sizeof(pctx->sql_str_value[row][col]),
+                        "%s%d.%d(%d)[%s]", value->sign ? "+" : "-", value->intg,
+                        value->frac, value->len, (char *)value->buf);
   pctx->sql_str_len[row][col] = len;
   pctx->sql_decimal_value[row][col].intg = value->intg;
   pctx->sql_decimal_value[row][col].frac = value->frac;
@@ -315,16 +309,15 @@ static int sql_get_decimal(void *ctx, const decimal_t *value) {
 }
 
 static int sql_get_double(void *ctx, double value, uint32 decimals) {
-  char buffer[1024];
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
   DBUG_ENTER("sql_get_double");
   uint row = pctx->num_rows;
   uint col = pctx->current_col;
   pctx->current_col++;
 
-  size_t len = snprintf(buffer, sizeof(buffer), "%3.7g", value);
+  size_t len = snprintf(pctx->sql_str_value[row][col],
+                        sizeof(pctx->sql_str_value[row][col]), "%3.7g", value);
 
-  strncpy(pctx->sql_str_value[row][col], buffer, len);
   pctx->sql_str_len[row][col] = len;
 
   pctx->sql_double_value[row][col] = value;
@@ -334,18 +327,16 @@ static int sql_get_double(void *ctx, double value, uint32 decimals) {
 }
 
 static int sql_get_date(void *ctx, const MYSQL_TIME *value) {
-  char buffer[1024];
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
   DBUG_ENTER("sql_get_date");
   uint row = pctx->num_rows;
   uint col = pctx->current_col;
   pctx->current_col++;
 
   size_t len =
-      snprintf(buffer, sizeof(buffer), "%s%4d-%02d-%02d", value->neg ? "-" : "",
-               value->year, value->month, value->day);
-
-  strncpy(pctx->sql_str_value[row][col], buffer, len);
+      snprintf(pctx->sql_str_value[row][col],
+               sizeof(pctx->sql_str_value[row][col]), "%s%4d-%02d-%02d",
+               value->neg ? "-" : "", value->year, value->month, value->day);
   pctx->sql_str_len[row][col] = len;
 
   pctx->sql_date_value[row][col].year = value->year;
@@ -362,19 +353,18 @@ static int sql_get_date(void *ctx, const MYSQL_TIME *value) {
 }
 
 static int sql_get_time(void *ctx, const MYSQL_TIME *value, uint decimals) {
-  char buffer[1024];
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
   DBUG_ENTER("sql_get_time");
   uint row = pctx->num_rows;
   uint col = pctx->current_col;
   pctx->current_col++;
 
   size_t len = snprintf(
-      buffer, sizeof(buffer), "%s%02d:%02d:%02d", value->neg ? "-" : "",
+      pctx->sql_str_value[row][col], sizeof(pctx->sql_str_value[row][col]),
+      "%s%02d:%02d:%02d", value->neg ? "-" : "",
       value->day ? (value->day * 24 + value->hour) : value->hour, value->minute,
       value->second);
 
-  strncpy(pctx->sql_str_value[row][col], buffer, len);
   pctx->sql_str_len[row][col] = len;
 
   pctx->sql_time_value[row][col].year = value->year;
@@ -392,19 +382,17 @@ static int sql_get_time(void *ctx, const MYSQL_TIME *value, uint decimals) {
 }
 
 static int sql_get_datetime(void *ctx, const MYSQL_TIME *value, uint decimals) {
-  char buffer[1024];
   struct st_plugin_ctx *pctx = (struct st_plugin_ctx *)ctx;
   DBUG_ENTER("sql_get_datetime");
   uint row = pctx->num_rows;
   uint col = pctx->current_col;
   pctx->current_col++;
 
-  size_t len =
-      snprintf(buffer, sizeof(buffer), "%s%4d-%02d-%02d %02d:%02d:%02d",
-               value->neg ? "-" : "", value->year, value->month, value->day,
-               value->hour, value->minute, value->second);
+  size_t len = snprintf(
+      pctx->sql_str_value[row][col], sizeof(pctx->sql_str_value[row][col]),
+      "%s%4d-%02d-%02d %02d:%02d:%02d", value->neg ? "-" : "", value->year,
+      value->month, value->day, value->hour, value->minute, value->second);
 
-  strncpy(pctx->sql_str_value[row][col], buffer, len);
   pctx->sql_str_len[row][col] = len;
 
   pctx->sql_datetime_value[row][col].year = value->year;
@@ -446,7 +434,8 @@ static void sql_handle_ok(void *ctx, uint server_status,
   pctx->warn_count = statement_warn_count;
   pctx->affected_rows = affected_rows;
   pctx->last_insert_id = last_insert_id;
-  if (message) strncpy(pctx->message, message, sizeof(pctx->message));
+  if (message) strncpy(pctx->message, message, sizeof(pctx->message) - 1);
+  pctx->message[sizeof(pctx->message) - 1] = '\0';
 
   DBUG_VOID_RETURN;
 }