Fix memory leak when deinitializing display feeder tasks

vroland · Apr 30, 2024 · 8cdf001 · 8cdf001
1 parent 29b2b19
commit 8cdf001
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/render.c b/src/render.c
@@ -17,6 +17,7 @@
 #include <stdio.h>
 #include <string.h>
 
+#include "esp_heap_caps.h"
 #include "output_common/line_queue.h"
 #include "output_common/lut.h"
 #include "output_common/render_context.h"
@@ -338,6 +339,7 @@ void epd_renderer_deinit() {
     for (int i = 0; i < NUM_RENDER_THREADS; i++) {
         vTaskDelete(render_context.feed_tasks[i]);
         lq_free(&render_context.line_queues[i]);
+        heap_caps_free(render_context.feed_line_buffers[i]);
         vSemaphoreDelete(render_context.feed_done_smphr[i]);
     }
 
@@ -351,8 +353,8 @@ void epd_renderer_deinit() {
         epd_board->deinit();
     }
 
-    free(render_context.conversion_lut);
-    free(render_context.line_threads);
+    heap_caps_free(render_context.conversion_lut);
+    heap_caps_free(render_context.line_threads);
     vSemaphoreDelete(render_context.frame_done);
 }
 

diff --git a/test/test_initialization.c b/test/test_initialization.c
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <unity.h>
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -35,11 +36,14 @@ TEST_CASE("re-initialization works", "[epdiy,e2e]")
 
     epd_deinit();
 
+    int before_init = esp_get_free_internal_heap_size();
     epd_init(&TEST_BOARD, &ED097TC2, EPD_OPTIONS_DEFAULT);
 
     epd_poweron();
     vTaskDelay(2);
     epd_poweroff();
 
     epd_deinit();
+    int after_init = esp_get_free_internal_heap_size();
+    TEST_ASSERT_EQUAL(after_init, before_init);
 }