gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-04-20 05:53:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix hash table chaining (again).

Browse Source 
Thanks to Peter Cawley.
This commit is contained in:
Mike Pall 2019-12-08 19:47:00 +01:00
parent 324aef08d9
commit de48d00094
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/lj_tab.c
View File

@ -452,8 +452,7 @@ TValue *lj_tab_newkey(lua_State *L, GCtab *t, cTValue *key)
/* Rechain pseudo-resurrected string keys with colliding hashes. */ /* Rechain pseudo-resurrected string keys with colliding hashes. */
while (nextnode(freenode)) { while (nextnode(freenode)) {
Node *nn = nextnode(freenode); Node *nn = nextnode(freenode);
if (tvisstr(&nn->key) && !tvisnil(&nn->val) && if (!tvisnil(&nn->val) && hashkey(t, &nn->key) == n) {
hashstr(t, strV(&nn->key)) == n) {
freenode->next = nn->next; freenode->next = nn->next;
nn->next = n->next; nn->next = n->next;
setmref(n->next, nn); setmref(n->next, nn);
@ -466,9 +465,9 @@ TValue *lj_tab_newkey(lua_State *L, GCtab *t, cTValue *key)
** any string key that's currently in a non-main positions. ** any string key that's currently in a non-main positions.
*/ */
while ((nn = nextnode(freenode))) { while ((nn = nextnode(freenode))) {
if (tvisstr(&nn->key) && !tvisnil(&nn->val)) { if (!tvisnil(&nn->val)) {
Node *mn = hashstr(t, strV(&nn->key)); Node *mn = hashkey(t, &nn->key);
if (mn != freenode) { if (mn != freenode && mn != nn) {
freenode->next = nn->next; freenode->next = nn->next;
nn->next = mn->next; nn->next = mn->next;
setmref(mn->next, nn); setmref(mn->next, nn);