diff options
| author | Mike Pall <mike> | 2014-09-08 23:39:02 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2014-09-08 23:39:02 +0200 |
| commit | 72c661e2b89939335b5d2e2437d3e17c26f1d898 (patch) | |
| tree | 0c438bace48dd5d2f209ef52f9a4ec2cf3785fb3 /src/lj_crecord.c | |
| parent | e107525f208d50c1229576c3831589d6fe458d7a (diff) | |
| parent | 41156fe1cdd6b60a5e8d9855c57699e89ccfbf97 (diff) | |
| download | luajit-72c661e2b89939335b5d2e2437d3e17c26f1d898.tar.gz luajit-72c661e2b89939335b5d2e2437d3e17c26f1d898.tar.bz2 luajit-72c661e2b89939335b5d2e2437d3e17c26f1d898.zip | |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_crecord.c')
| -rw-r--r-- | src/lj_crecord.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lj_crecord.c b/src/lj_crecord.c index 4e64f431..acd786f5 100644 --- a/src/lj_crecord.c +++ b/src/lj_crecord.c | |||
| @@ -1466,6 +1466,7 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd) | |||
| 1466 | } | 1466 | } |
| 1467 | } else if (!tref_isnum(tr)) { | 1467 | } else if (!tref_isnum(tr)) { |
| 1468 | tr = 0; | 1468 | tr = 0; |
| 1469 | ct = ctype_get(cts, CTID_P_VOID); | ||
| 1469 | } | 1470 | } |
| 1470 | ok: | 1471 | ok: |
| 1471 | s[i] = ct; | 1472 | s[i] = ct; |