aboutsummaryrefslogtreecommitdiffstats
path: root/package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch
diff options
context:
space:
mode:
Diffstat (limited to 'package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch')
-rw-r--r--package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch b/package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch
index ac0722c707..58cc894e1c 100644
--- a/package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch
+++ b/package/utils/lua/patches/010-lua-5.1.3-lnum-full-260308.patch
@@ -1589,18 +1589,18 @@
+ * (and doing them).
+ */
+int try_addint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
-+ lua_Integer v= ib+ic; /* may overflow */
-+ if (ib>0 && ic>0) { if (v < 0) return 0; /*overflow, use floats*/ }
-+ else if (ib<0 && ic<0) { if (v >= 0) return 0; }
-+ *r= v;
++ /* Signed int overflow is undefined behavior, so catch it without causing it. */
++ if (ic>0) { if (ib > LUA_INTEGER_MAX - ic) return 0; /*overflow, use floats*/ }
++ else { if (ib < LUA_INTEGER_MIN - ic) return 0; }
++ *r = ib + ic;
+ return 1;
+}
+
+int try_subint( lua_Integer *r, lua_Integer ib, lua_Integer ic ) {
-+ lua_Integer v= ib-ic; /* may overflow */
-+ if (ib>=0 && ic<0) { if (v < 0) return 0; /*overflow, use floats*/ }
-+ else if (ib<0 && ic>0) { if (v >= 0) return 0; }
-+ *r= v;
++ /* Signed int overflow is undefined behavior, so catch it without causing it. */
++ if (ic>0) { if (ib < LUA_INTEGER_MIN + ic) return 0; /*overflow, use floats*/ }
++ else { if (ib > LUA_INTEGER_MAX + ic) return 0; }
++ *r = ib - ic;
+ return 1;
+}
+