Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit952d776

Browse files
committed
Increase buffer size in order to avoid buffer overflow when using large floating point numbers
1 parentf3cfa2f commit952d776

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

‎api/String.cpp‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,20 @@
2323
#include"itoa.h"
2424
#include"deprecated-avr-comp/avr/dtostrf.h"
2525

26+
#include<float.h>
27+
28+
namespacearduino {
29+
2630
/*********************************************/
27-
/*Constructors*/
31+
/*Static Member Initialisation*/
2832
/*********************************************/
2933

30-
namespacearduino {
34+
size_tconst String::FLT_MAX_DECIMAL_PLACES;
35+
size_tconst String::DBL_MAX_DECIMAL_PLACES;
36+
37+
/*********************************************/
38+
/* Constructors*/
39+
/*********************************************/
3140

3241
String::String(constchar *cstr)
3342
{
@@ -111,15 +120,17 @@ String::String(unsigned long value, unsigned char base)
111120

112121
String::String(float value,unsignedchar decimalPlaces)
113122
{
123+
staticsize_tconst FLOAT_BUF_SIZE = FLT_MAX_10_EXP + FLT_MAX_DECIMAL_PLACES +1/* '-'*/ +1/* '.'*/ +1/* '\0'*/;
114124
init();
115-
char buf[33];
125+
char buf[FLOAT_BUF_SIZE];
116126
*this =dtostrf(value, (decimalPlaces +2), decimalPlaces, buf);
117127
}
118128

119129
String::String(double value,unsignedchar decimalPlaces)
120130
{
131+
staticsize_tconst DOUBLE_BUF_SIZE = DBL_MAX_10_EXP + DBL_MAX_DECIMAL_PLACES +1/* '-'*/ +1/* '.'*/ +1/* '\0'*/;
121132
init();
122-
char buf[33];
133+
char buf[DOUBLE_BUF_SIZE];
123134
*this =dtostrf(value, (decimalPlaces +2), decimalPlaces, buf);
124135
}
125136

‎api/String.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,9 @@ class String
5858
typedefvoid (String::*StringIfHelperType)()const;
5959
voidStringIfHelper()const {}
6060

61+
staticsize_tconst FLT_MAX_DECIMAL_PLACES =10;
62+
staticsize_tconst DBL_MAX_DECIMAL_PLACES = FLT_MAX_DECIMAL_PLACES;
63+
6164
public:
6265
// constructors
6366
// creates a copy of the initial value.

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp