Merge pull request #785 from lioncash/string

Common: Fix AsciiToHex returning true on overflow values
dolphin-emu · Aug 12, 2014 · 4301081 · 4301081
2 parents 9f4008c + 5afb9cc
commit 4301081
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/Source/Core/Common/StringUtil.cpp b/Source/Core/Common/StringUtil.cpp
@@ -28,12 +28,18 @@
 // faster than sscanf
 bool AsciiToHex(const std::string& _szValue, u32& result)
 {
+	// Set errno to a good state.
+	errno = 0;
+
 	char *endptr = nullptr;
 	const u32 value = strtoul(_szValue.c_str(), &endptr, 16);
 
 	if (!endptr || *endptr)
 		return false;
 
+	if (errno == ERANGE)
+		return false;
+
 	result = value;
 	return true;
 }