Merge branch 'master' into v2.1

2 files changed, 2 insertions, 2 deletions

diff --git a/src/lib_ffi.c b/src/lib_ffi.c
index 3310b205..6203481b 100644
--- a/src/lib_ffi.c
+++ b/src/lib_ffi.c
@@ -658,7 +658,7 @@ LJLIB_CF(ffi_string)	LJLIB_REC(.)
   TValue *o = lj_lib_checkany(L, 1);
   const char *p;
   size_t len;
-  if (o+1 < L->top) {
+  if (o+1 < L->top && !tvisnil(o+1)) {
     len = (size_t)ffi_checkint(L, 2);
     lj_cconv_ct_tv(cts, ctype_get(cts, CTID_P_CVOID), (uint8_t *)&p, o,
                    CCF_ARG(1));
diff --git a/src/lj_crecord.c b/src/lj_crecord.c
index 87f58256..41d41904 100644
--- a/src/lj_crecord.c
+++ b/src/lj_crecord.c
@@ -1535,7 +1535,7 @@ void LJ_FASTCALL recff_ffi_string(jit_State *J, RecordFFData *rd)
   TRef tr = J->base[0];
   if (tr) {
     TRef trlen = J->base[1];
-    if (trlen) {
+    if (!tref_isnil(trlen)) {
       trlen = crec_toint(J, cts, trlen, &rd->argv[1]);
       tr = crec_ct_tv(J, ctype_get(cts, CTID_P_CVOID), 0, tr, &rd->argv[0]);
     } else {