fix number2integer conversion for floating-point builds (#2605)

This commit is contained in:
Javier Peletier 2019-01-15 17:06:11 +01:00 committed by Marcel Stör
parent 1adbc79106
commit ca92cfd362
1 changed files with 12 additions and 2 deletions

View File

@ -702,8 +702,18 @@ union luai_Cast { double l_d; long l_l; };
/* this option always works, but may be slow */ /* this option always works, but may be slow */
#else #else
#define lua_number2int(i,d) ((i)=(int)(d))
#define lua_number2integer(i,d) ((i)=(lua_Integer)(d)) #ifdef LUA_NUMBER_INTEGRAL
#define lua_number2int(i, d) ((i) = (int)(d))
#define lua_number2integer(i, d) ((i) = (lua_Integer)(d))
#else // for floating-point builds, cast to a larger integer first to avoid undefined behavior on overflows.
#define lua_number2int(i, d) ((i) = (int)(long long)(d))
#define lua_number2integer(i, d) ((i) = (lua_Integer)(long long)(d))
#endif // LUA_NUMBER_INTEGRAL
#endif #endif