From 199bb533a0da6568e7fcbf428a26318b1d013d6f Mon Sep 17 00:00:00 2001
From: Sandeep Mistry <s.mistry@arduino.cc>
Date: Wed, 14 Sep 2016 13:50:52 -0400
Subject: [PATCH] Increase buffer size for converting floats + doubles to
String's
---
hardware/arduino/avr/cores/arduino/WString.cpp | 6 ++++--
hardware/arduino/sam/cores/arduino/WString.cpp | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/hardware/arduino/avr/cores/arduino/WString.cpp b/hardware/arduino/avr/cores/arduino/WString.cpp
index f2572d60883..4ccfdb2416a 100644
--- a/hardware/arduino/avr/cores/arduino/WString.cpp
+++ b/hardware/arduino/avr/cores/arduino/WString.cpp
@@ -19,6 +19,8 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <float.h>
+
#include "WString.h"
/*********************************************/
@@ -108,14 +110,14 @@ String::String(unsigned long value, unsigned char base)
String::String(float value, unsigned char decimalPlaces)
{
init();
- char buf[33];
+ char buf[FLT_MAX_10_EXP + 4 + decimalPlaces]; // +4, one for: 10, -, ., \0
*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
}
String::String(double value, unsigned char decimalPlaces)
{
init();
- char buf[33];
+ char buf[DBL_MAX_10_EXP + 4 + decimalPlaces]; // +4, one for: 10, -, ., \0
*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
}
diff --git a/hardware/arduino/sam/cores/arduino/WString.cpp b/hardware/arduino/sam/cores/arduino/WString.cpp
index 71bbc07d13b..65b117db281 100644
--- a/hardware/arduino/sam/cores/arduino/WString.cpp
+++ b/hardware/arduino/sam/cores/arduino/WString.cpp
@@ -19,6 +19,8 @@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <float.h>
+
#include "WString.h"
#include "itoa.h"
#include "avr/dtostrf.h"
@@ -110,14 +112,14 @@ String::String(unsigned long value, unsigned char base)
String::String(float value, unsigned char decimalPlaces)
{
init();
- char buf[33];
+ char buf[FLT_MAX_10_EXP + 4 + decimalPlaces]; // +4, one for: 10, -, ., \0
*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
}
String::String(double value, unsigned char decimalPlaces)
{
init();
- char buf[33];
+ char buf[DBL_MAX_10_EXP + 4 + decimalPlaces]; // +4, one for: 10, -, ., \0
*this = dtostrf(value, (decimalPlaces + 2), decimalPlaces, buf);
}