Fix for MDEV-10173: Ignore decimals if the value exceeds the type

specifc maximum of 6 digits
mariadb-corporation · Jun 3, 2016 · 392dc4d · 392dc4d
1 parent 3192cd4
commit 392dc4d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/libmariadb/ma_stmt_codec.c b/libmariadb/ma_stmt_codec.c
@@ -864,7 +864,7 @@ void ps_fetch_datetime(MYSQL_BIND *r_param, const MYSQL_FIELD * field,
       break;
     case MYSQL_TYPE_TIME:
       length= sprintf(dtbuffer, "%s%02u:%02u:%02u", (tm.neg ? "-" : ""), tm.hour, tm.minute, tm.second);
-      if (field->decimals)
+      if (field->decimals && field->decimals <= 6)
       {
         char ms[8];
         sprintf(ms, ".%06u", tm.second_part);
@@ -877,7 +877,7 @@ void ps_fetch_datetime(MYSQL_BIND *r_param, const MYSQL_FIELD * field,
     case MYSQL_TYPE_DATETIME:
     case MYSQL_TYPE_TIMESTAMP:
       length= sprintf(dtbuffer, "%04u-%02u-%02u %02u:%02u:%02u", tm.year, tm.month, tm.day, tm.hour, tm.minute, tm.second);
-      if (field->decimals)
+      if (field->decimals && field->decimals <= 6)
       {
         char ms[8];
         sprintf(ms, ".%06u", tm.second_part);