font-manager: use CAMLReturn and fix deadlock

Co-authored-by: Bryan Phelps <bryphe@outrunlabs.com>
Lulzx · Jun 24, 2020 · 647daf6 · 647daf6
1 parent 338d44e
commit 647daf6
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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));