From 647daf6e861eeaaf244db9c26bf03cdd9605c80c Mon Sep 17 00:00:00 2001 From: EduardoRFS Date: Tue, 23 Jun 2020 21:42:20 -0300 Subject: [PATCH] font-manager: use CAMLReturn and fix deadlock Co-authored-by: Bryan Phelps --- src/reason-font-manager/FontManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/reason-font-manager/FontManager.cpp b/src/reason-font-manager/FontManager.cpp index e44f52729..c4ef1e11a 100644 --- a/src/reason-font-manager/FontManager.cpp +++ b/src/reason-font-manager/FontManager.cpp @@ -31,13 +31,13 @@ CAMLprim value fm_findFont(value family, value weight, value width, value italic delete query; + caml_acquire_runtime_system(); + if (font == NULL) { caml_raise_not_found(); - return Val_unit; + CAMLreturn(Val_unit); } - caml_acquire_runtime_system(); - ret = caml_alloc(7, 0); Store_field(ret, 0, caml_copy_string(font->path));