Merge pull request #28 from pjohnmeyer/fixCheckEqualCrashForLargeNumbers

pjohnmeyer · pjohnmeyer · commit e6c93118aacd · 2013-02-08T18:46:04.000-08:00
Changed sprintf to snprintf in MemoryOutStream::FormatToStream. Fixes #18.
diff --git a/src/MemoryOutStream.cpp b/src/MemoryOutStream.cpp
@@ -32,8 +32,9 @@ void FormatToStream(MemoryOutStream& stream, char const* format, ValueType const
 {
 	using namespace std;
 
-    char txt[32];
-    sprintf(txt, format, value);
+    const size_t BUFFER_SIZE=32;
+    char txt[BUFFER_SIZE];
+    snprintf(txt, BUFFER_SIZE, format, value);
     stream << txt;
 }
 
@@ -127,7 +128,7 @@ MemoryOutStream& MemoryOutStream::operator <<(unsigned long long const n)
 
 MemoryOutStream& MemoryOutStream::operator <<(float const f)
 {
-    FormatToStream(*this, "%ff", f);
+    FormatToStream(*this, "%0.6f", f);
     return *this;    
 }
 
@@ -145,7 +146,7 @@ MemoryOutStream& MemoryOutStream::operator <<(unsigned int const s)
 
 MemoryOutStream& MemoryOutStream::operator <<(double const d)
 {
-	FormatToStream(*this, "%f", d);
+	FormatToStream(*this, "%0.6f", d);
 	return *this;
 }
 
diff --git a/src/tests/TestMemoryOutStream.cpp b/src/tests/TestMemoryOutStream.cpp
@@ -4,6 +4,7 @@
 #include <cstring>
 #include <climits>
 #include <cstdlib>
+#include <cfloat>
 
 using namespace UnitTest;
 using namespace std;
@@ -152,15 +153,15 @@ TEST(WritingStringLongerThanCapacityFitsInNewBuffer)
 TEST(WritingIntLongerThanCapacityFitsInNewBuffer)
 {
     MemoryOutStream stream(8);
-    stream << "aaaa" << 123456;;
+    stream << "aaaa" << 123456;
     CHECK_EQUAL("aaaa123456", stream.GetText());
 }
 
 TEST(WritingFloatLongerThanCapacityFitsInNewBuffer)
 {
     MemoryOutStream stream(8);
-    stream << "aaaa" << 123456.0f;;
-    CHECK_EQUAL("aaaa123456.000000f", stream.GetText());
+    stream << "aaaa" << 123456.0f;
+    CHECK_EQUAL("aaaa123456.000000", stream.GetText());
 }
 
 TEST(WritingSizeTLongerThanCapacityFitsInNewBuffer)
@@ -170,6 +171,13 @@ TEST(WritingSizeTLongerThanCapacityFitsInNewBuffer)
     CHECK_EQUAL("aaaa32145", stream.GetText());
 }
 
+TEST(VerifyLargeDoubleCanBeStreamedWithoutCrashing)
+{
+    MemoryOutStream stream(8);
+    stream << DBL_MAX;
+    CHECK(true);
+}
+
 #endif
 
 }

Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,9 @@ void FormatToStream(MemoryOutStream& stream, char const* format, ValueType const`
`32`	`32`	`{`
`33`	`33`	`using namespace std;`
`34`	`34`
`35`		`- char txt[32];`
`36`		`- sprintf(txt, format, value);`
	`35`	`+ const size_t BUFFER_SIZE=32;`
	`36`	`+ char txt[BUFFER_SIZE];`
	`37`	`+ snprintf(txt, BUFFER_SIZE, format, value);`
`37`	`38`	`stream << txt;`
`38`	`39`	`}`
`39`	`40`
`@@ -127,7 +128,7 @@ MemoryOutStream& MemoryOutStream::operator <<(unsigned long long const n)`
`127`	`128`
`128`	`129`	`MemoryOutStream& MemoryOutStream::operator <<(float const f)`
`129`	`130`	`{`
`130`		`- FormatToStream(*this, "%ff", f);`
	`131`	`+ FormatToStream(*this, "%0.6f", f);`
`131`	`132`	`return *this;`
`132`	`133`	`}`
`133`	`134`
`@@ -145,7 +146,7 @@ MemoryOutStream& MemoryOutStream::operator <<(unsigned int const s)`
`145`	`146`
`146`	`147`	`MemoryOutStream& MemoryOutStream::operator <<(double const d)`
`147`	`148`	`{`
`148`		`- FormatToStream(*this, "%f", d);`
	`149`	`+ FormatToStream(*this, "%0.6f", d);`
`149`	`150`	`return *this;`
`150`	`151`	`}`
`151`	`152`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`#include <cstring>`
`5`	`5`	`#include <climits>`
`6`	`6`	`#include <cstdlib>`
	`7`	`+#include <cfloat>`
`7`	`8`
`8`	`9`	`using namespace UnitTest;`
`9`	`10`	`using namespace std;`
`@@ -152,15 +153,15 @@ TEST(WritingStringLongerThanCapacityFitsInNewBuffer)`
`152`	`153`	`TEST(WritingIntLongerThanCapacityFitsInNewBuffer)`
`153`	`154`	`{`
`154`	`155`	`MemoryOutStream stream(8);`
`155`		`- stream << "aaaa" << 123456;;`
	`156`	`+ stream << "aaaa" << 123456;`
`156`	`157`	`CHECK_EQUAL("aaaa123456", stream.GetText());`
`157`	`158`	`}`
`158`	`159`
`159`	`160`	`TEST(WritingFloatLongerThanCapacityFitsInNewBuffer)`
`160`	`161`	`{`
`161`	`162`	`MemoryOutStream stream(8);`
`162`		`- stream << "aaaa" << 123456.0f;;`
`163`		`- CHECK_EQUAL("aaaa123456.000000f", stream.GetText());`
	`163`	`+ stream << "aaaa" << 123456.0f;`
	`164`	`+ CHECK_EQUAL("aaaa123456.000000", stream.GetText());`
`164`	`165`	`}`
`165`	`166`
`166`	`167`	`TEST(WritingSizeTLongerThanCapacityFitsInNewBuffer)`
`@@ -170,6 +171,13 @@ TEST(WritingSizeTLongerThanCapacityFitsInNewBuffer)`
`170`	`171`	`CHECK_EQUAL("aaaa32145", stream.GetText());`
`171`	`172`	`}`
`172`	`173`
	`174`	`+TEST(VerifyLargeDoubleCanBeStreamedWithoutCrashing)`
	`175`	`+{`
	`176`	`+ MemoryOutStream stream(8);`
	`177`	`+ stream << DBL_MAX;`
	`178`	`+ CHECK(true);`
	`179`	`+}`
	`180`	`+`
`173`	`181`	`#endif`
`174`	`182`
`175`	`183`	`}`