You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
49 lines
1.4 KiB
49 lines
1.4 KiB
6 years ago
|
diff --git a/src/lnum.c b/src/lnum.c
|
||
|
|
index 1456b6a2ed23..b0632b04c2b7 100644
|
||
|
|
--- a/src/lnum.c
|
||
|
|
+++ b/src/lnum.c
|
||
|
|
@@ -127,6 +127,8 @@ static int luaO_str2i (const char *s, lua_Integer *res, char **endptr_ref) {
|
||
|
|
#else
|
||
|
|
return 0; /* Reject the number */
|
||
|
|
#endif
|
||
|
|
+ } else if (v > LUA_INTEGER_MAX) {
|
||
|
|
+ return TK_NUMBER;
|
||
|
|
}
|
||
|
|
} else if ((v > LUA_INTEGER_MAX) || (*endptr && (!isspace(*endptr)))) {
|
||
|
|
return TK_NUMBER; /* not in signed range, or has '.', 'e' etc. trailing */
|
||
|
|
@@ -310,3 +312,13 @@ int try_unmint( lua_Integer *r, lua_Integer ib ) {
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
+#ifdef LONG_OVERFLOW_LUA_INTEGER
|
||
|
|
+unsigned LUA_INTEGER lua_str2ul( const char *str, char **endptr, int base ) {
|
||
|
|
+ unsigned long v= strtoul(str, endptr, base);
|
||
|
|
+ if ( v > LUA_INTEGER_MAX ) {
|
||
|
|
+ errno= ERANGE;
|
||
|
|
+ v= ULONG_MAX;
|
||
|
|
+ }
|
||
|
|
+ return (unsigned LUA_INTEGER)v;
|
||
|
|
+}
|
||
|
|
+#endif
|
||
|
|
diff --git a/src/lnum_config.h b/src/lnum_config.h
|
||
|
|
index 19d7a4231a49..1092eead6629 100644
|
||
|
|
--- a/src/lnum_config.h
|
||
|
|
+++ b/src/lnum_config.h
|
||
|
|
@@ -141,7 +141,12 @@
|
||
|
|
#endif
|
||
|
|
|
||
|
|
#ifndef lua_str2ul
|
||
|
|
-# define lua_str2ul (unsigned LUA_INTEGER)strtoul
|
||
|
|
+# if LONG_MAX > LUA_INTEGER_MAX
|
||
|
|
+# define LONG_OVERFLOW_LUA_INTEGER
|
||
|
|
+ unsigned LUA_INTEGER lua_str2ul( const char *str, char **endptr, int base );
|
||
|
|
+# else
|
||
|
|
+# define lua_str2ul (unsigned LUA_INTEGER)strtoul
|
||
|
|
+# endif
|
||
|
|
#endif
|
||
|
|
#ifndef LUA_INTEGER_MIN
|
||
|
|
# define LUA_INTEGER_MIN (-LUA_INTEGER_MAX -1) /* -2^16|32 */
|
||
|
|
--
|
||
|
|
1.9.1
|
||
|
|
|