Changeset cce0807

Timestamp:

Nov 14, 2023, 12:18:04 PM (5 months ago)

Author:

caparson <caparson@…>

Branches:

master

Children:

df8ba61a

Parents:

c46c999

Message:

Fixed non-local ehm memory leak that occurs when a coroutine is deleted while suspended in a catchresume handler

File:

• libcfa/src/concurrency/coroutine.cfa (modified) (2 diffs)

libcfa/src/concurrency/coroutine.cfa

@@ -318 +318 @@
 void defaultResumeAtHandler( exception_t * except ) {
     __cfaehm_allocate_exception( except );
-    free( except );
     __cfaehm_begin_unwind( (void(*)(exception_t *))defaultTerminationHandler );
 }
+
+struct ehm_cleanup {
+        exception_t * ex;
+};
+
+void ^?{}( ehm_cleanup & this ) { free( this.ex ); }
 
 bool poll( coroutine$ * cor ) libcfa_public {
@@ -330 +335 @@
     // otherwise loop and throwResume all pending exceptions
     while ( nl_ex != 0p ){
-        exception_t * ex = nl_ex->the_exception;
+                ehm_cleanup ex_holder{ nl_ex->the_exception };
         free( nl_ex );
-        __cfaehm_throw_resume( ex, defaultResumeAtHandler );
+        __cfaehm_throw_resume( ex_holder.ex , defaultResumeAtHandler );
         
-        // only reached if resumption handled. other dealloc handled in defaultResumeAtHandler
-        free( ex );
         nl_ex = pop_ehm_head( cor );
     }