Skip to content

fix: memory leak in par=2 EndSort #691

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

Merged
merged 1 commit into from
Jul 15, 2025
Merged

fix: memory leak in par=2 EndSort #691

Show file tree
Hide file tree
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
11 changes: 11 additions & 0 deletions check/fixes.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3905,3 +3905,14 @@ Print;
assert succeeded?
assert result("test") =~ expr("1")
*--#] PullReq652 :
*--#[ PullReq691 :
#-
#: SubTermsInSmall 112
#: SubLargePatches 10
* A par=2 EndSort, which ends in the PObuffer.
* This tests a repaired memory leak.
Symbol x;
#$dol = <x^1>+...+<x^1001>;
.end
assert succeeded?
*--#] PullReq691 :
22 changes: 3 additions & 19 deletions sources/sort.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,7 @@ LONG EndSort(PHEAD WORD *buffer, int par)
GETBIDENTITY
SORTING *S = AT.SS;
WORD j, **ss, *to, *t;
LONG sSpace, over, tover, spare, retval = 0, jj;
LONG sSpace, over, tover, spare, retval = 0;
POSITION position, pp;
off_t lSpace;
FILEHANDLE *fout = 0, *oldoutfile = 0, *newout = 0;
Expand Down Expand Up @@ -1012,24 +1012,8 @@ LONG EndSort(PHEAD WORD *buffer, int par)
}
else {
t = newout->PObuffer;
if ( par == 2 ) {
jj = newout->POfill - t;
if ( AN.tryterm > 0 && ( (jj+2)*sizeof(WORD) < (size_t)(AM.MaxTer) ) ) {
to = TermMalloc("$-sort space");
}
else {
LONG allocsp = jj+2;
if ( allocsp < MINALLOC ) allocsp = MINALLOC;
allocsp = ((allocsp+7)/8)*8;
to = (WORD *)Malloc1(allocsp*sizeof(WORD),"$-sort space");
if ( AN.tryterm > 0 ) AN.tryterm = 0;
}
*((WORD **)buffer) = to;
NCOPY(to,t,jj);
/* we should not set retval here in this par==2 case, it being 0 has meaning
after RetRetval, and it is set properly there. */
}
else {
// We deal with the par == 2 case after RetRetval.
if ( par != 2 ) {
j = newout->POfill - t;
to = buffer;
if ( to >= AT.WorkSpace && to < AT.WorkTop && to+j > AT.WorkTop )
Expand Down
Loading