gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 15:14:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

FFI: Fix various issues in recff_cdata_arith.

Browse Source 
Thanks to Sergey Kaplun. #1224
This commit is contained in:
Mike Pall 2024-07-03 23:46:47 +02:00
parent f602f0154b
commit 7a608e4425
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lj_crecord.c
View File

@ -1367,7 +1367,8 @@ static TRef crec_arith_meta(jit_State *J, TRef *sp, CType **s, CTState *cts,
void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd) void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
{ {
CTState *cts = ctype_ctsG(J2G(J)); CTState *cts = ctype_cts(J->L);
MMS mm = (MMS)rd->data;
TRef sp[2]; TRef sp[2];
CType *s[2]; CType *s[2];
MSize i; MSize i;
@ -1417,6 +1418,8 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
} }
} }
} else if (tref_isnil(tr)) { } else if (tref_isnil(tr)) {
if (!(mm == MM_len || mm == MM_eq || mm == MM_lt || mm == MM_le))
lj_trace_err(J, LJ_TRERR_BADTYPE);
tr = lj_ir_kptr(J, NULL); tr = lj_ir_kptr(J, NULL);
ct = ctype_get(cts, CTID_P_VOID); ct = ctype_get(cts, CTID_P_VOID);
} else if (tref_isinteger(tr)) { } else if (tref_isinteger(tr)) {
@ -1435,12 +1438,12 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
ct = ctype_child(cts, cct); ct = ctype_child(cts, cct);
tr = lj_ir_kint(J, (int32_t)ofs); tr = lj_ir_kint(J, (int32_t)ofs);
} else { /* Interpreter will throw or return false. */ } else { /* Interpreter will throw or return false. */
ct = ctype_get(cts, CTID_P_VOID); lj_trace_err(J, LJ_TRERR_BADTYPE);
} }
} else if (ctype_isptr(ct->info)) { } else if (ctype_isptr(ct->info)) {
tr = emitir(IRT(IR_ADD, IRT_PTR), tr, lj_ir_kintp(J, sizeof(GCstr))); tr = emitir(IRT(IR_ADD, IRT_PTR), tr, lj_ir_kintp(J, sizeof(GCstr)));
} else { } else {
ct = ctype_get(cts, CTID_P_VOID); lj_trace_err(J, LJ_TRERR_BADTYPE);
} }
} else if (!tref_isnum(tr)) { } else if (!tref_isnum(tr)) {
tr = 0; tr = 0;
@ -1452,7 +1455,6 @@ void LJ_FASTCALL recff_cdata_arith(jit_State *J, RecordFFData *rd)
} }
{ {
TRef tr; TRef tr;
MMS mm = (MMS)rd->data;
if ((mm == MM_len || mm == MM_concat || if ((mm == MM_len || mm == MM_concat ||
(!(tr = crec_arith_int64(J, sp, s, mm)) && (!(tr = crec_arith_int64(J, sp, s, mm)) &&
!(tr = crec_arith_ptr(J, sp, s, mm)))) && !(tr = crec_arith_ptr(J, sp, s, mm)))) &&