From 9d54e765903998ad8be2f8aab84a052713a9f710 Mon Sep 17 00:00:00 2001 From: Allen Webster Date: Mon, 20 Nov 2017 21:28:46 -0500 Subject: [PATCH] Fixed crash with temp on linux and mac --- platform_linux/linux_4ed.cpp | 7 +++---- platform_mac/mac_4ed.cpp | 8 ++++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/platform_linux/linux_4ed.cpp b/platform_linux/linux_4ed.cpp index 7e6f8673..eedf965b 100644 --- a/platform_linux/linux_4ed.cpp +++ b/platform_linux/linux_4ed.cpp @@ -514,6 +514,9 @@ Sys_Font_Path(name, parameters){ } } + Partition *part = &shared_vars.font_scratch; + path.temp = begin_temp_memory(part); + b32 got_font = false; if (pattern_styled != 0){ if (FcConfigSubstitute(fc_config, pattern_styled, FcMatchPattern)){ @@ -526,8 +529,6 @@ Sys_Font_Path(name, parameters){ if (font != 0){ FcPatternGetString(font, FC_FILE, 0, &filename); if (filename != 0){ - Partition *part = &shared_vars.font_scratch; - path.temp = begin_temp_memory(part); i32 len = str_size((char*)filename); char *buffer = push_array(part, char, len + 1); if (buffer == 0){ @@ -563,8 +564,6 @@ Sys_Font_Path(name, parameters){ if (font != 0){ FcPatternGetString(font, FC_FILE, 0, &filename); if (filename != 0){ - Partition *part = &shared_vars.font_scratch; - path.temp = begin_temp_memory(part); i32 len = str_size((char*)filename); char *buffer = push_array(part, char, len + 1); if (buffer == 0){ diff --git a/platform_mac/mac_4ed.cpp b/platform_mac/mac_4ed.cpp index 151020bf..7981d929 100644 --- a/platform_mac/mac_4ed.cpp +++ b/platform_mac/mac_4ed.cpp @@ -346,12 +346,12 @@ Sys_Font_Path(name, parameters){ } OSX_Font_Match match = osx_get_font_match(name, pt_size, italic, bold); - + Font_Path path = {0}; + Partition *part = &shared_vars.font_scratch; + path.temp = begin_temp_memory(part); + if (match.path != 0){ - Partition *part = &shared_vars.font_scratch; - path.temp = begin_temp_memory(part); - i32 len = str_size(match.path); char *buffer = push_array(part, char, len + 1); if (buffer == 0){