Merge branch 'master' into v2.1

2 files changed, 4 insertions, 2 deletions

diff --git a/src/lib_base.c b/src/lib_base.c
index 57b0c0ad..bf98f284 100644
--- a/src/lib_base.c
+++ b/src/lib_base.c
@@ -243,7 +243,9 @@ LJLIB_CF(unpack)
     } else {
       setnilV(L->top++);
     }
-  } while (i++ < e);
+    if (i >= e) break;
+    i++;
+  } while (1);
   return n;
 }
 
diff --git a/src/lj_carith.c b/src/lj_carith.c
index 9c0c81c3..12c3ced2 100644
--- a/src/lj_carith.c
+++ b/src/lj_carith.c
@@ -120,7 +120,7 @@ static int carith_ptr(lua_State *L, CTState *cts, CDArith *ca, MMS mm)
         /* All valid pointer differences on x64 are in (-2^47, +2^47),
         ** which fits into a double without loss of precision.
         */
-        setintptrV(L->top-1, (int32_t)diff);
+        setintptrV(L->top-1, diff);
         return 1;
       } else if (mm == MM_lt) {  /* Pointer comparison (unsigned). */
         setboolV(L->top-1, ((uintptr_t)pp < (uintptr_t)pp2));