Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(patches): fix luajit segment release check in internal memory allocator #13219

Closed
wants to merge 1 commit into from
Closed

chore(patches): fix luajit segment release check in internal memory allocator #13219

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions build/openresty/patches/LuaJIT-2.1-20231117_03_fix-segment-release.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
From 9b5e837ac2dfdc0638830c048a47ca9378c504d3 Mon Sep 17 00:00:00 2001
From: Mike Pall <mike>
Date: Fri, 19 Apr 2024 01:44:19 +0200
Subject: [PATCH] Fix segment release check in internal memory allocator.

Thanks to Jinji Zeng. #1179 #1157
---
src/lj_alloc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bundle/LuaJIT-2.1-20231117/src/lj_alloc.c b/bundle/LuaJIT-2.1-20231117/src/lj_alloc.c
index 9adaa0e5bd..0c0c0c4f4c 100644
--- a/bundle/LuaJIT-2.1-20231117/src/lj_alloc.c
+++ b/bundle/LuaJIT-2.1-20231117/src/lj_alloc.c
@@ -1057,7 +1057,7 @@ static size_t release_unused_segments(mstate m)
mchunkptr p = align_as_chunk(base);
size_t psize = chunksize(p);
/* Can unmap if first chunk holds entire segment and not pinned */
- if (!cinuse(p) && (char *)p + psize >= base + size - TOP_FOOT_SIZE) {
+ if (!cinuse(p) && (char *)p + psize == (char *)mem2chunk(sp)) {
tchunkptr tp = (tchunkptr)p;
if (p == m->dv) {
m->dv = 0;
Loading