Fix undefined behavior for ReadColor

botder · botder · commit 53121a3b3084 · 2019-07-26T23:23:28.000+02:00
diff --git a/Shared/sdk/CScriptArgReader.h b/Shared/sdk/CScriptArgReader.h
@@ -479,7 +479,7 @@ class CScriptArgReader
         ReadNumber(color);
 
         if (!m_bError)
-            outValue = static_cast<unsigned int>(color);
+            outValue = static_cast<unsigned long>(static_cast<int64_t>(color));
     }
 
     //
@@ -491,7 +491,7 @@ class CScriptArgReader
         ReadNumber(color, static_cast<lua_Number>(defaultValue));
 
         if (!m_bError)
-            outValue = static_cast<unsigned int>(color);
+            outValue = static_cast<unsigned long>(static_cast<int64_t>(color));
     }
 
     //

Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ class CScriptArgReader`
`479`	`479`	`ReadNumber(color);`
`480`	`480`
`481`	`481`	`if (!m_bError)`
`482`		`- outValue = static_cast<unsigned int>(color);`
	`482`	`+ outValue = static_cast<unsigned long>(static_cast<int64_t>(color));`
`483`	`483`	`}`
`484`	`484`
`485`	`485`	`//`
`@@ -491,7 +491,7 @@ class CScriptArgReader`
`491`	`491`	`ReadNumber(color, static_cast<lua_Number>(defaultValue));`
`492`	`492`
`493`	`493`	`if (!m_bError)`
`494`		`- outValue = static_cast<unsigned int>(color);`
	`494`	`+ outValue = static_cast<unsigned long>(static_cast<int64_t>(color));`
`495`	`495`	`}`
`496`	`496`
`497`	`497`	`//`