Merge branch 'master' into v2.1

2013-09-08 03:10:47 +02:00
parent a13b9206dc 93c2b939bd
commit 0d41601e76
2 changed files with 2 additions and 2 deletions
--- 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 {