Commitfae13e5

committed

Exchanging the type of 'value' from 'long' to 'double' prevents overflow when parsing float values.

However, we still need to ensure against too large values contained in streams. This should be possible because the maximum length of a float value pre-comma is known to be 38 digits (FLT_MAX_10_EXP).

1 parent5445db3 commitfae13e5Copy full SHA for fae13e5

File tree

1 file changed

-6

lines changed

api
- Stream.cpp

1 file changed

-6

lines changed

`‎api/Stream.cpp‎`

Lines changed: 8 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -24,6 +24,7 @@`
`24`	`24`
`25`	`25`	`#include"Common.h"`
`26`	`26`	`#include"Stream.h"`
	`27`	`+#include<math.h>`
`27`	`28`
`28`	`29`	`#definePARSE_TIMEOUT1000// default number of milli-seconds to wait`
`29`	`30`
`@@ -162,9 +163,9 @@ float Stream::parseFloat(LookaheadMode lookahead, char ignore)`
`162`	`163`	`{`
`163`	`164`	`bool isNegative =false;`
`164`	`165`	`bool isFraction =false;`
`165`		`-long value =0;`
	`166`	`+double value =0.0;`
`166`	`167`	`int c;`
`167`		`-float fraction =1.0;`
	`168`	`+unsignedint digits_post_comma =0;`
`168`	`169`
`169`	`170`	`c =peekNextDigit(lookahead,true);`
`170`	`171`	`// ignore non numeric leading characters`
`@@ -181,7 +182,7 @@ float Stream::parseFloat(LookaheadMode lookahead, char ignore)`
`181`	`182`	`elseif(c >='0' && c <='9') {// is c a digit?`
`182`	`183`	`value = value *10 + c -'0';`
`183`	`184`	`if(isFraction)`
`184`		`-fraction *=0.1;`
	`185`	`+digits_post_comma++;`
`185`	`186`	`}`
`186`	`187`	`read();// consume the character we got with peek`
`187`	`188`	`c =timedPeek();`
`@@ -190,10 +191,11 @@ float Stream::parseFloat(LookaheadMode lookahead, char ignore)`
`190`	`191`
`191`	`192`	`if(isNegative)`
`192`	`193`	`value = -value;`
	`194`	`+`
`193`	`195`	`if(isFraction)`
`194`		`-returnvalue* fraction;`
`195`		`-else`
`196`		`-return value;`
	`196`	`+ value/=pow(10, digits_post_comma);`
	`197`	`+`
	`198`	`+return value;`
`197`	`199`	`}`
`198`	`200`
`199`	`201`	`// read characters from stream into buffer`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitfae13e5

File tree

1 file changed

1 file changed

`‎api/Stream.cpp‎`

0 commit comments