From 124a6e297ece36a788ecf8762df46bd563bfb27d Mon Sep 17 00:00:00 2001 From: minggo Date: Mon, 3 Jun 2019 23:36:06 -0700 Subject: [PATCH] fix memory leak in loading font on iOS/mac (#1761) --- .../scripting/js-bindings/manual/jsb_platfrom_apple.mm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/native/cocos/scripting/js-bindings/manual/jsb_platfrom_apple.mm b/native/cocos/scripting/js-bindings/manual/jsb_platfrom_apple.mm index 5bfb101817..d3e1205223 100644 --- a/native/cocos/scripting/js-bindings/manual/jsb_platfrom_apple.mm +++ b/native/cocos/scripting/js-bindings/manual/jsb_platfrom_apple.mm @@ -112,6 +112,13 @@ static bool JSB_loadFont(se::State& s) ok &= seval_to_std_string(args[0], &originalFamilyName); SE_PRECONDITION2(ok, false, "JSB_loadFont : Error processing argument: originalFamilyName"); + // Don't reload font again to avoid memory leak. + if (_fontFamilyNameMap.find(originalFamilyName) != _fontFamilyNameMap.end()) + { + s.rval().setString(_fontFamilyNameMap[originalFamilyName]); + return true; + } + std::string source; ok &= seval_to_std_string(args[1], &source); SE_PRECONDITION2(ok, false, "JSB_loadFont : Error processing argument: source");