aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Pall <mike>2024-04-19 01:47:48 +0200
committerMike Pall <mike>2024-04-19 01:47:48 +0200
commit75e92777988017fe47c5eb290998021bbf972d1f (patch)
tree3c9aede41b402cb64c8cfdf662ab118712367727
parentd032c637b1c1cf4a8cb4f52155459f6e91405bda (diff)
parent9b5e837ac2dfdc0638830c048a47ca9378c504d3 (diff)
downloadluajit-75e92777988017fe47c5eb290998021bbf972d1f.tar.gz
luajit-75e92777988017fe47c5eb290998021bbf972d1f.tar.bz2
luajit-75e92777988017fe47c5eb290998021bbf972d1f.zip
Merge branch 'master' into v2.1
-rw-r--r--src/lj_alloc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lj_alloc.c b/src/lj_alloc.c
index 20e60493..cb704f7b 100644
--- a/src/lj_alloc.c
+++ b/src/lj_alloc.c
@@ -1057,7 +1057,7 @@ static size_t release_unused_segments(mstate m)
1057 mchunkptr p = align_as_chunk(base); 1057 mchunkptr p = align_as_chunk(base);
1058 size_t psize = chunksize(p); 1058 size_t psize = chunksize(p);
1059 /* Can unmap if first chunk holds entire segment and not pinned */ 1059 /* Can unmap if first chunk holds entire segment and not pinned */
1060 if (!cinuse(p) && (char *)p + psize >= base + size - TOP_FOOT_SIZE) { 1060 if (!cinuse(p) && (char *)p + psize == (char *)mem2chunk(sp)) {
1061 tchunkptr tp = (tchunkptr)p; 1061 tchunkptr tp = (tchunkptr)p;
1062 if (p == m->dv) { 1062 if (p == m->dv) {
1063 m->dv = 0; 1063 m->dv = 0;