Skip to content

Fixes for test 508 #718

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 2 commits into from
Oct 7, 2025
Merged

Fixes for test 508 #718

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffdcff8
fix: avoid hang in tform when threads fail a memory allocation
jodavies Sep 30, 2025
fd84e56
test: fix test for Issue508 on some systems
jodavies Sep 30, 2025
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
2 changes: 1 addition & 1 deletion check/fixes.frm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2983,7 +2983,7 @@ id g(N?) = 1;
print;
.end
#require linux?
#ulimit -v 8_000_000
#ulimit -v 8_200_000
# We assume more memory than a 32bit system can provide
#require wordsize >= 4
assert succeeded?
Expand Down
6 changes: 1 addition & 5 deletions sources/tools.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2226,7 +2226,6 @@ void *Malloc1(LONG size, const char *messageifwrong)
char *t, *u;
int i;
LOCK(MallocLock);
/* MLOCK(ErrorMessageLock); */
if ( size == 0 ) {
MesPrint("%wAsking for 0 bytes in Malloc1");
}
Expand All @@ -2244,13 +2243,10 @@ void *Malloc1(LONG size, const char *messageifwrong)
MLOCK(ErrorMessageLock);
#endif
MesPrint("Attempted to allocate %l bytes.", size);
Error1("No memory while allocating ",(UBYTE *)messageifwrong);
MesPrint("@No memory while allocating %s", (UBYTE *)messageifwrong);
#ifndef MALLOCDEBUG
MUNLOCK(ErrorMessageLock);
#else
/* MUNLOCK(ErrorMessageLock); */
#endif
#ifdef MALLOCDEBUG
UNLOCK(MallocLock);
#endif
Terminate(-1);
Expand Down