1 diff --git a/src/lnum.c b/src/lnum.c
2 index 1456b6a2ed23..b0632b04c2b7 100644
5 @@ -127,6 +127,8 @@ static int luaO_str2i (const char *s, lua_Integer *res, char **endptr_ref) {
7 return 0; /* Reject the number */
9 + } else if (v > LUA_INTEGER_MAX) {
12 } else if ((v > LUA_INTEGER_MAX) || (*endptr && (!isspace(*endptr)))) {
13 return TK_NUMBER; /* not in signed range, or has '.', 'e' etc. trailing */
14 @@ -310,3 +312,13 @@ int try_unmint( lua_Integer *r, lua_Integer ib ) {
18 +#ifdef LONG_OVERFLOW_LUA_INTEGER
19 +unsigned LUA_INTEGER lua_str2ul( const char *str, char **endptr, int base ) {
20 + unsigned long v= strtoul(str, endptr, base);
21 + if ( v > LUA_INTEGER_MAX ) {
25 + return (unsigned LUA_INTEGER)v;
28 diff --git a/src/lnum_config.h b/src/lnum_config.h
29 index 19d7a4231a49..1092eead6629 100644
30 --- a/src/lnum_config.h
31 +++ b/src/lnum_config.h
36 -# define lua_str2ul (unsigned LUA_INTEGER)strtoul
37 +# if LONG_MAX > LUA_INTEGER_MAX
38 +# define LONG_OVERFLOW_LUA_INTEGER
39 + unsigned LUA_INTEGER lua_str2ul( const char *str, char **endptr, int base );
41 +# define lua_str2ul (unsigned LUA_INTEGER)strtoul
44 #ifndef LUA_INTEGER_MIN
45 # define LUA_INTEGER_MIN (-LUA_INTEGER_MAX -1) /* -2^16|32 */