aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch')
-rw-r--r--package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch48
1 files changed, 48 insertions, 0 deletions
diff --git a/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch b/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch
new file mode 100644
index 0000000000..7f00c8c3a2
--- /dev/null
+++ b/package/utils/lua/patches/013-lnum-strtoul-parsing-fixes.patch
@@ -0,0 +1,48 @@
+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
+