Bug #30150719 INCORRECT LENGTH IN READ_OK_EX()

Tor Didriksen · Tor Didriksen · commit c44b18041fe4 · 2019-08-12T11:15:44.000+02:00
Fix warnings from clang 8 and gcc 8.

Change-Id: I7a44c6758764621033bb41badb6f58927993f362
diff --git a/rapid/plugin/group_replication/src/sql_service/sql_service_interface.cc b/rapid/plugin/group_replication/src/sql_service/sql_service_interface.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2018, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2015, 2019, 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,
@@ -25,7 +25,7 @@
 #include <mysqld_error.h>
 
 /* keep it in sync with enum_server_command in my_command.h */
-const LEX_STRING command_name[]={
+const LEX_STRING command_name[] MY_ATTRIBUTE((unused)) = {
   { C_STRING_WITH_LEN("Sleep") },
   { C_STRING_WITH_LEN("Quit") },
   { C_STRING_WITH_LEN("Init DB") },
diff --git a/sql-common/client.c b/sql-common/client.c
@@ -813,9 +813,7 @@ void read_ok_ex(MYSQL *mysql, ulong length) {
 
             if (is_charset == 1) {
               char charset_name[MY_CS_NAME_SIZE * 8]; // MY_CS_BUFFER_SIZE
-              size_t length = data->length > (sizeof(charset_name) - 1)
-                                  ? sizeof(charset_name - 1)
-                                  : data->length;
+              size_t length = MY_MIN(data->length, (sizeof(charset_name) - 1));
               saved_cs = mysql->charset;
 
               memcpy(charset_name, data->str, length);
diff --git a/sql/log_event.cc b/sql/log_event.cc
@@ -7583,7 +7583,7 @@ int User_var_log_event::pack_info(Protocol* protocol)
   else
   {
     switch (type) {
-    case REAL_RESULT:
+    case REAL_TYPE:
       double real_val;
       float8get(&real_val, val);
       if (!(buf= (char*) my_malloc(key_memory_log_event,
@@ -7593,15 +7593,15 @@ int User_var_log_event::pack_info(Protocol* protocol)
       event_len+= my_gcvt(real_val, MY_GCVT_ARG_DOUBLE, MY_GCVT_MAX_FIELD_WIDTH,
                           buf + val_offset, NULL);
       break;
-    case INT_RESULT:
+    case INT_TYPE:
       if (!(buf= (char*) my_malloc(key_memory_log_event,
                                    val_offset + 22, MYF(MY_WME))))
         return 1;
       event_len= longlong10_to_str(uint8korr(val), buf + val_offset, 
                                    ((flags & User_var_log_event::UNSIGNED_F) ? 
                                     10 : -10))-buf;
       break;
-    case DECIMAL_RESULT:
+    case DECIMAL_TYPE:
     {
       if (!(buf= (char*) my_malloc(key_memory_log_event,
                                    val_offset + DECIMAL_MAX_STR_LENGTH + 1,
@@ -7615,7 +7615,7 @@ int User_var_log_event::pack_info(Protocol* protocol)
       event_len= str.length() + val_offset;
       break;
     } 
-    case STRING_RESULT:
+    case STRING_TYPE:
       /* 15 is for 'COLLATE' and other chars */
       buf= (char*) my_malloc(key_memory_log_event,
                              event_len+val_len*2+1+2*MY_CS_NAME_SIZE+15,
@@ -7636,7 +7636,7 @@ int User_var_log_event::pack_info(Protocol* protocol)
         event_len= p-buf;
       }
       break;
-    case ROW_RESULT:
+    case ROW_TYPE:
     default:
       DBUG_ASSERT(1);
       return 1;
@@ -7690,14 +7690,14 @@ bool User_var_log_event::write(IO_CACHE* file)
     int4store(buf1 + 2, charset_number);
 
     switch (type) {
-    case REAL_RESULT:
+    case REAL_TYPE:
       float8store(buf2, *(double*) val);
       break;
-    case INT_RESULT:
+    case INT_TYPE:
       int8store(buf2, *(longlong*) val);
       unsigned_len= 1;
       break;
-    case DECIMAL_RESULT:
+    case DECIMAL_TYPE:
     {
       my_decimal *dec= (my_decimal *)val;
       dec->sanity_check();
@@ -7707,10 +7707,10 @@ bool User_var_log_event::write(IO_CACHE* file)
       val_len= decimal_bin_size(buf2[0], buf2[1]) + 2;
       break;
     }
-    case STRING_RESULT:
+    case STRING_TYPE:
       pos= (uchar*) val;
       break;
-    case ROW_RESULT:
+    case ROW_TYPE:
     default:
       DBUG_ASSERT(1);
       return 0;
@@ -7895,7 +7895,7 @@ int User_var_log_event::do_apply_event(Relay_log_info const *rli)
   else
   {
     switch (type) {
-    case REAL_RESULT:
+    case REAL_TYPE:
       if (val_len != 8)
       {
         rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
@@ -7908,7 +7908,7 @@ int User_var_log_event::do_apply_event(Relay_log_info const *rli)
       val= (char*) &real_val;		// Pointer to value in native format
       val_len= 8;
       break;
-    case INT_RESULT:
+    case INT_TYPE:
       if (val_len != 8)
       {
         rli->report(ERROR_LEVEL, ER_SLAVE_FATAL_ERROR,
@@ -7921,7 +7921,7 @@ int User_var_log_event::do_apply_event(Relay_log_info const *rli)
       val= (char*) &int_val;		// Pointer to value in native format
       val_len= 8;
       break;
-    case DECIMAL_RESULT:
+    case DECIMAL_TYPE:
     {
       if (val_len < 3)
       {
@@ -7936,10 +7936,10 @@ int User_var_log_event::do_apply_event(Relay_log_info const *rli)
       val_len= sizeof(my_decimal);
       break;
     }
-    case STRING_RESULT:
+    case STRING_TYPE:
       it= new Item_string(val, val_len, charset);
       break;
-    case ROW_RESULT:
+    case ROW_TYPE:
     default:
       DBUG_ASSERT(1);
       DBUG_RETURN(0);
diff --git a/sql/sql_join_buffer.h b/sql/sql_join_buffer.h
@@ -359,7 +359,9 @@ class JOIN_CACHE :public QEP_operation
   /* Shall calculate how much space is remaining in the join buffer */ 
   virtual ulong rem_space() 
   { 
-    return std::max<ulong>(buff_size-(end_pos-buff)-aux_buff_size, 0UL);
+    DBUG_ASSERT(end_pos >= buff);
+    DBUG_ASSERT(buff_size >= ulong(end_pos - buff));
+    return ulong(buff_size - (end_pos - buff) - aux_buff_size);
   }
 
   /* Shall skip record from the join buffer if its match flag is on */
@@ -829,8 +831,10 @@ class JOIN_CACHE_BKA_UNIQUE :public JOIN_CACHE_BKA
   */ 
   ulong rem_space() 
   { 
-    return std::max(static_cast<ulong>(last_key_entry - end_pos-aux_buff_size),
-                    0UL);
+    DBUG_ASSERT(last_key_entry >= end_pos);
+    DBUG_ASSERT(buff_size >= aux_buff_size);
+    DBUG_ASSERT(ulong(last_key_entry - end_pos) >= aux_buff_size);
+    return ulong(last_key_entry - end_pos - aux_buff_size);
   }
 
   /* 
diff --git a/storage/innobase/fts/fts0opt.cc b/storage/innobase/fts/fts0opt.cc
@@ -687,7 +687,7 @@ fts_fetch_index_words(
 	fts_zip_t*	zip = static_cast<fts_zip_t*>(user_arg);
 	que_node_t*	exp = sel_node->select_list;
 	dfield_t*	dfield = que_node_get_val(exp);
-	short		len =  static_cast<short>(dfield_get_len(dfield));
+	ushort		len =  static_cast<ushort>(dfield_get_len(dfield));
 	void*		data = dfield_get_data(dfield);
 
 	/* Skip the duplicate words. */
diff --git a/storage/perfschema/pfs_builtin_memory.cc b/storage/perfschema/pfs_builtin_memory.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2019, 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,
@@ -21,6 +21,7 @@
   51 Franklin Street, Suite 500, Boston, MA 02110-1335 USA */
 
 #include "my_global.h"
+#include "m_string.h"
 #include "pfs_global.h"
 #include "pfs_builtin_memory.h"
 
@@ -115,7 +116,8 @@ static void init_builtin_memory_class(PFS_builtin_memory_class *klass, const cha
   klass->m_class.m_timed= false; /* Immutable */
   klass->m_class.m_flags= PSI_FLAG_GLOBAL;
   klass->m_class.m_event_name_index= 0;
-  strncpy(klass->m_class.m_name, name, sizeof(klass->m_class.m_name));
+  my_snprintf(klass->m_class.m_name, sizeof(klass->m_class.m_name), "%.*s",
+              PFS_MAX_INFO_NAME_LENGTH - 1, name);
   klass->m_class.m_name_length= strlen(name);
   DBUG_ASSERT(klass->m_class.m_name_length < sizeof(klass->m_class.m_name));
   klass->m_class.m_timer= NULL;
diff --git a/unittest/gunit/gis_algos-t.cc b/unittest/gunit/gis_algos-t.cc
@@ -1,4 +1,4 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2014, 2019, 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,
@@ -259,10 +259,6 @@ TEST_F(GeometryManipulationTest, PolygonManipulationTest)
                      ls0->get_flags(), ls0->get_srid());
   Gis_line_string ls00(*ls0);
 
-  ls= ls;
-  ls00= ls00;
-  plgn= plgn;
-
   Geometry_buffer buffer3;
   String wkt3, str3;
 

Original file line number	Diff line number	Diff line change
`@@ -359,7 +359,9 @@ class JOIN_CACHE :public QEP_operation`
`359`	`359`	`/* Shall calculate how much space is remaining in the join buffer */`
`360`	`360`	`virtual ulong rem_space()`
`361`	`361`	`{`
`362`		`- return std::max<ulong>(buff_size-(end_pos-buff)-aux_buff_size, 0UL);`
	`362`	`+ DBUG_ASSERT(end_pos >= buff);`
	`363`	`+ DBUG_ASSERT(buff_size >= ulong(end_pos - buff));`
	`364`	`+ return ulong(buff_size - (end_pos - buff) - aux_buff_size);`
`363`	`365`	`}`
`364`	`366`
`365`	`367`	`/* Shall skip record from the join buffer if its match flag is on */`
`@@ -829,8 +831,10 @@ class JOIN_CACHE_BKA_UNIQUE :public JOIN_CACHE_BKA`
`829`	`831`	`*/`
`830`	`832`	`ulong rem_space()`
`831`	`833`	`{`
`832`		`- return std::max(static_cast<ulong>(last_key_entry - end_pos-aux_buff_size),`
`833`		`- 0UL);`
	`834`	`+ DBUG_ASSERT(last_key_entry >= end_pos);`
	`835`	`+ DBUG_ASSERT(buff_size >= aux_buff_size);`
	`836`	`+ DBUG_ASSERT(ulong(last_key_entry - end_pos) >= aux_buff_size);`
	`837`	`+ return ulong(last_key_entry - end_pos - aux_buff_size);`
`834`	`838`	`}`
`835`	`839`
`836`	`840`	`/*`