From 5167dad198508e2dac10bf89c6b2991cfc791ee6 Mon Sep 17 00:00:00 2001 From: Robin Haberkorn Date: Fri, 4 Jun 2021 01:17:38 +0200 Subject: guard against too low arguments to by checking whether the memory limit would be exceeded * Checking whether the allocation succeeded may not prevent exceeding the memory limit excessively. * Even if the memory limit is not exceeded, the allocation can fail theoretically and the program would terminate abnormally. This however is true for all allocations in SciTECO (via glib). * teco_memory_check() therefore now supports checking whether an allocation would exceed the memory limit which will be useful before very large or variable allocations in addition to the regular checking in teco_machine_main_step(). * As a sideeffect, this fixes the "Searching with large counts" test case on Mac OS where too large allocations were not detected as expected (apparently Mac OS happily gives out ridiculously large chunks of memory). Now, all platforms are guaranteed to have the same behaviour. --- src/memory.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/memory.h') diff --git a/src/memory.h b/src/memory.h index 58705a7..b2160e7 100644 --- a/src/memory.h +++ b/src/memory.h @@ -25,4 +25,4 @@ void teco_memory_stop_limiting(void); gboolean teco_memory_set_limit(gsize new_limit, GError **error); -gboolean teco_memory_check(GError **error); +gboolean teco_memory_check(gsize request, GError **error); -- cgit v1.2.3