danmar#7500 buffer overflow: encodeMultiChar lib/mathlib.cpp:343. Improve errors handling

amai2012 · amai2012 · commit 4f77a2b044e9 · 2016-05-17T20:43:32.000+02:00
diff --git a/lib/mathlib.cpp b/lib/mathlib.cpp
@@ -356,6 +356,8 @@ MathLib::bigint MathLib::characterLiteralToLongNumber(const std::string& str)
     // is implementation-defined.
     // clang and gcc seem to use the following encoding: 'AB' as (('A' << 8) | 'B')
     const std::string& normStr = normalizeCharacterLiteral(str);
+    if (normStr.empty())
+        throw InternalError(0, "Internal Error. MathLib::characterLiteralToLongNumber: Unhandled char constant '" + str + "'.");
     return encodeMultiChar(normStr);
 }
 
diff --git a/test/testmathlib.cpp b/test/testmathlib.cpp
@@ -301,6 +301,7 @@ class TestMathLib : public TestFixture {
             ASSERT_EQUALS(0, MathLib::characterLiteralToLongNumber(std::string("")));
             ASSERT_EQUALS(32, MathLib::characterLiteralToLongNumber(std::string(" ")));
             ASSERT_EQUALS(538976288, MathLib::characterLiteralToLongNumber(std::string("          ")));
+            ASSERT_THROW(MathLib::characterLiteralToLongNumber(std::string("\\u")), InternalError);
         }
 
         ASSERT_EQUALS(-8552249625308161526, MathLib::toLongNumber("0x89504e470d0a1a0a"));

Original file line number	Diff line number	Diff line change
`@@ -356,6 +356,8 @@ MathLib::bigint MathLib::characterLiteralToLongNumber(const std::string& str)`
`356`	`356`	`// is implementation-defined.`
`357`	`357`	`// clang and gcc seem to use the following encoding: 'AB' as (('A' << 8) \| 'B')`
`358`	`358`	`const std::string& normStr = normalizeCharacterLiteral(str);`
	`359`	`+ if (normStr.empty())`
	`360`	`+ throw InternalError(0, "Internal Error. MathLib::characterLiteralToLongNumber: Unhandled char constant '" + str + "'.");`
`359`	`361`	`return encodeMultiChar(normStr);`
`360`	`362`	`}`
`361`	`363`
Original file line number	Diff line number	Diff line change
`@@ -301,6 +301,7 @@ class TestMathLib : public TestFixture {`
`301`	`301`	`ASSERT_EQUALS(0, MathLib::characterLiteralToLongNumber(std::string("")));`
`302`	`302`	`ASSERT_EQUALS(32, MathLib::characterLiteralToLongNumber(std::string(" ")));`
`303`	`303`	`ASSERT_EQUALS(538976288, MathLib::characterLiteralToLongNumber(std::string(" ")));`
	`304`	`+ ASSERT_THROW(MathLib::characterLiteralToLongNumber(std::string("\\u")), InternalError);`
`304`	`305`	`}`
`305`	`306`
`306`	`307`	`ASSERT_EQUALS(-8552249625308161526, MathLib::toLongNumber("0x89504e470d0a1a0a"));`