BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Patch built-in Lua to fix miscompile on Android (#12347)

Browse Source
This commit is contained in:
paradust7 2022-05-21 08:46:50 -07:00 committed by GitHub
parent 9ee3dc71f1
commit e1f707d7e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/lua/src/lgc.c
View File

@ -164,8 +164,13 @@ static int traversetable (global_State *g, Table *h) {
markobject(g, h->metatable); markobject(g, h->metatable);
mode = gfasttm(g, h->metatable, TM_MODE); mode = gfasttm(g, h->metatable, TM_MODE);
if (mode && ttisstring(mode)) { /* is there a weak mode? */ if (mode && ttisstring(mode)) { /* is there a weak mode? */
weakkey = (strchr(svalue(mode), 'k') != NULL); // Android's 'FORTIFY libc' calls __builtin_object_size on the argument of strchr.
weakvalue = (strchr(svalue(mode), 'v') != NULL); // This produces an incorrect size for the expression `svalue(mode)`, causing
// an assertion. By placing it in a temporary, __builtin_object_size returns
// -1 (for unknown size) which functions correctly.
const char *tmp = svalue(mode);
weakkey = (strchr(tmp, 'k') != NULL);
weakvalue = (strchr(tmp, 'v') != NULL);
if (weakkey || weakvalue) { /* is really weak? */ if (weakkey || weakvalue) { /* is really weak? */
h->marked &= ~(KEYWEAK | VALUEWEAK); /* clear bits */ h->marked &= ~(KEYWEAK | VALUEWEAK); /* clear bits */
h->marked |= cast_byte((weakkey << KEYWEAKBIT) | h->marked |= cast_byte((weakkey << KEYWEAKBIT) |