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/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));