Merge branch 'master' into v2.1

1 files changed, 1 insertions, 1 deletions

diff --git a/src/lj_ffrecord.c b/src/lj_ffrecord.c
index 770b1586..92902b70 100644
--- a/src/lj_ffrecord.c
+++ b/src/lj_ffrecord.c
@@ -323,9 +323,9 @@ static void LJ_FASTCALL recff_select(jit_State *J, RecordFFData *rd)
       ptrdiff_t n = (ptrdiff_t)J->maxslot;
       if (start < 0) start += n;
       else if (start > n) start = n;
-      rd->nres = n - start;
       if (start >= 1) {
         ptrdiff_t i;
+        rd->nres = n - start;
         for (i = 0; i < n - start; i++)
           J->base[i] = J->base[start+i];
       }  /* else: Interpreter will throw. */