Fix for CONC-177: Fixed length calculation for zerofill conversion from

float/double to string
mariadb-corporation · May 14, 2016 · ca68323 · ca68323
1 parent 3823a0f
commit ca68323
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 12 deletions.
diff --git a/libmariadb/ma_stmt_codec.c b/libmariadb/ma_stmt_codec.c
@@ -248,39 +248,39 @@ static void convert_froma_string(MYSQL_BIND *r_param, char *buffer, size_t len)
       *r_param->error= error ? 1 : r_param->is_unsigned ? NUMERIC_TRUNCATION(val, 0, UINT_MAX16) : NUMERIC_TRUNCATION(val, INT_MIN16, INT_MAX16) || error > 0;
       shortstore(r_param->buffer, (short)val);
       r_param->buffer_length= sizeof(short);
-    } 
+    }
     break;
     case MYSQL_TYPE_LONG:
     {
       longlong val= my_atoll(buffer, buffer + len, &error);
       *r_param->error=error ? 1 : r_param->is_unsigned ? NUMERIC_TRUNCATION(val, 0, UINT_MAX32) : NUMERIC_TRUNCATION(val, INT_MIN32, INT_MAX32) || error > 0;
       longstore(r_param->buffer, (int32)val);
       r_param->buffer_length= sizeof(uint32);
-    } 
+    }
     break;
     case MYSQL_TYPE_LONGLONG:
     {
       longlong val= my_atoll(buffer, buffer + len, &error);
       *r_param->error= error > 0; /* no need to check for truncation */
       longlongstore(r_param->buffer, val);
       r_param->buffer_length= sizeof(longlong);
-    } 
+    }
     break;
     case MYSQL_TYPE_DOUBLE:
     {
       double val= my_atod(buffer, buffer + len, &error);
       *r_param->error= error > 0; /* no need to check for truncation */
       float8store(r_param->buffer, val);
       r_param->buffer_length= sizeof(double);
-    } 
+    }
     break;
     case MYSQL_TYPE_FLOAT:
     {
       float val= (float)my_atod(buffer, buffer + len, &error);
       *r_param->error= error > 0; /* no need to check for truncation */
       float4store(r_param->buffer, val);
       r_param->buffer_length= sizeof(float);
-    } 
+    }
     break;
     case MYSQL_TYPE_TIME:
     case MYSQL_TYPE_DATE:
@@ -311,7 +311,7 @@ static void convert_froma_string(MYSQL_BIND *r_param, char *buffer, size_t len)
           memcpy(r_param->buffer, start, MIN(copylen, r_param->buffer_length));
       }
       if (copylen < r_param->buffer_length)
-        ((char *)r_param->buffer)[copylen]= '\0';
+        ((char *)r_param->buffer)[copylen]= 0;
       *r_param->error= (copylen > r_param->buffer_length);
 
       *r_param->length= (ulong)len; 
@@ -375,7 +375,7 @@ static void convert_from_long(MYSQL_BIND *r_param, const MYSQL_FIELD *field, lon
       /* check if field flag is zerofill */
 
       convert_froma_string(r_param, buffer, len);
-    }  
+    }
     break;
   }
 }
@@ -592,9 +592,11 @@ static void convert_from_float(MYSQL_BIND *r_param, const MYSQL_FIELD *field, fl
         if (field->length < length || field->length > MAX_DOUBLE_STRING_REP_LENGTH - 1)
           break;
         ma_bmove_upp(buff + field->length, buff + length, length);
-        memset((char*) buff, 0, field->length - length);
+        memset((char*) buff, '0', field->length - length);
+        length= field->length;
       }
-      convert_froma_string(r_param, buff, strlen(buff));
+
+      convert_froma_string(r_param, buff, length);
     }  
     break;
   } 
@@ -689,10 +691,11 @@ static void convert_from_double(MYSQL_BIND *r_param, const MYSQL_FIELD *field, d
        if (field->length < length || field->length > MAX_DOUBLE_STRING_REP_LENGTH - 1)
          break;
        ma_bmove_upp(buff + field->length, buff + length, length);
-       memset((char*) buff, 0, field->length - length);
+       memset((char*) buff, '0', field->length - length);
+       length= field->length;
      }
-     convert_froma_string(r_param, buff, strlen(buff));
-    }  
+     convert_froma_string(r_param, buff, length);
+    } 
     break;
   } 
 }

diff --git a/unittest/libmariadb/ps_bugs.c b/unittest/libmariadb/ps_bugs.c
@@ -4147,7 +4147,52 @@ static int test_conc167(MYSQL *mysql)
   return OK;
 }
 
+static int test_conc177(MYSQL *mysql)
+{
+  MYSQL_STMT *stmt;
+  int rc;
+  MYSQL_BIND bind[2];
+  char *stmt_str= "SELECT a,b FROM t1";
+  char buf1[128], buf2[128];
+
+  rc= mysql_query(mysql, "DROP TABLE IF EXISTS t1");
+  check_mysql_rc(rc, mysql);
+
+  rc= mysql_query(mysql, "CREATE TABLE t1 (a double zerofill default 8.8,b float zerofill default 8.8)");
+  check_mysql_rc(rc, mysql);
+  rc= mysql_query(mysql, "INSERT INTO t1 VALUES (DEFAULT, DEFAULT)");
+  check_mysql_rc(rc, mysql);
+
+  stmt= mysql_stmt_init(mysql);
+  rc= mysql_stmt_prepare(stmt, stmt_str, strlen(stmt_str));
+  check_stmt_rc(rc, stmt);
+  rc= mysql_stmt_execute(stmt);
+  check_stmt_rc(rc, stmt);
+
+  memset(bind, 0, 2 * sizeof(MYSQL_BIND));
+  bind[0].buffer= &buf1;
+  bind[0].buffer_type= MYSQL_TYPE_STRING;
+  bind[0].buffer_length= 128;
+  bind[1].buffer= &buf2;
+  bind[1].buffer_type= MYSQL_TYPE_STRING;
+  bind[1].buffer_length= 128;
+
+  rc= mysql_stmt_bind_result(stmt, bind);
+  check_stmt_rc(rc, stmt);
+
+  rc= mysql_stmt_fetch(stmt);
+  mysql_stmt_close(stmt);
+
+  diag("buf1 %s\nbuf2 %s", buf1, buf2);
+
+  FAIL_IF(strcmp(buf1, "00000000000000000008.8"), "Expected 00000000000000000008.8");
+  FAIL_IF(strcmp(buf2, "0000000008.8"), "Expected 0000000008.8");
+
+  return OK;
+}
+
 struct my_tests_st my_tests[] = {
+  {"test_conc177", test_conc177, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
   {"test_conc167", test_conc167, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
   {"test_conc168", test_conc168, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},
   {"test_conc155", test_conc155, TEST_CONNECTION_DEFAULT, 0, NULL, NULL},