diff options
| author | Mike Pall <mike> | 2016-07-17 16:01:10 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2016-07-17 16:01:10 +0200 |
| commit | b74ddaf174ce087cf9d6087766afcb7180656661 (patch) | |
| tree | e7591a8a3bd9994e8550dccab0c9b2ddd5a3493d /src/lj_crecord.c | |
| parent | 1914de71c7dc10c502ecf033c63665eb6d3e6433 (diff) | |
| download | luajit2-b74ddaf174ce087cf9d6087766afcb7180656661.tar.gz | |
Fix for cdata vs. non-cdata arithmetics/comparisons.
Thanks to Vyacheslav Egorov.
Diffstat (limited to 'src/lj_crecord.c')
| -rw-r--r-- | src/lj_crecord.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lj_crecord.c b/src/lj_crecord.c index a53a2ce9..0565e5fd 100644 --- a/src/lj_crecord.c +++ b/src/lj_crecord.c @@ -1205,7 +1205,7 @@ void LJ_FASTCALL recff_cdata_call(jit_State *J, RecordFFData *rd) static TRef crec_arith_int64(jit_State *J, TRef *sp, CType **s, MMS mm) { - if (ctype_isnum(s[0]->info) && ctype_isnum(s[1]->info)) { + if (sp[0] && sp[1] && ctype_isnum(s[0]->info) && ctype_isnum(s[1]->info)) { IRType dt; CTypeID id; TRef tr; @@ -1263,6 +1263,7 @@ static TRef crec_arith_ptr(jit_State *J, TRef *sp, CType **s, MMS mm) { CTState *cts = ctype_ctsG(J2G(J)); CType *ctp = s[0]; + if (!(sp[0] && sp[1])) return 0; if (ctype_isptr(ctp->info) || ctype_isrefarray(ctp->info)) { if ((mm == MM_sub || mm == MM_eq || mm == MM_lt || mm == MM_le) && (ctype_isptr(s[1]->info) || ctype_isrefarray(s[1]->info))) { |