From f8354d492d4ab3a7514cf5bfb28452f83cb662c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 15 Nov 2019 15:13:06 +0100 Subject: Fix crash when freeing Blender after GTests This only frees brush_rng and random_tex_array when they were actually previously allocated. In a unit test (see D6246) I want to be able to partially start Blender so that I can load a blend file. To prevent memory leaks, I also want to be able to release memory, which currently requires calling `BKE_blender_free()`. This unconditionally calls `RE_texture_rng_exit()` and `BKE_brush_system_exit()`, which now crash on freeing `NULL`. This patch fixes that. Allocation (`BKE_brush_system_init()`) and freeing (`BKE_brush_system_exit()`) are done asymmetrically. The allocation functions are called from `main()` in the creator module, but the freeing is done by `BKE_blender_free()` the Window Manager. Ideally we symmetrise this and initialise Blender from outside the window manager (so that the initialisation can be done without WM and Python too), but for now I'm happy when things don't crash. Reviewed by: sergey via pair programming --- source/blender/render/intern/source/render_texture.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source/blender/render') diff --git a/source/blender/render/intern/source/render_texture.c b/source/blender/render/intern/source/render_texture.c index be53a1cb067..3f3dc9842a5 100644 --- a/source/blender/render/intern/source/render_texture.c +++ b/source/blender/render/intern/source/render_texture.c @@ -70,7 +70,11 @@ void RE_texture_rng_init(void) void RE_texture_rng_exit(void) { + if (random_tex_array == NULL) { + return; + } BLI_rng_threaded_free(random_tex_array); + random_tex_array = NULL; } /* ------------------------------------------------------------------------- */ -- cgit v1.2.3