Fix some memory bugs caught by asan

07th-mod · Aug 29, 2021 · 5fe5b0d · 5fe5b0d
1 parent fd57193
commit 5fe5b0d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/PonscripterLabel_text.cpp b/src/PonscripterLabel_text.cpp
@@ -227,6 +227,8 @@ PonscripterLabel::drawString(const char* str, rgb_t color, Fontinfo* info,
             continue;
         }
 
+        if (!*str) { break; }
+
         if (*str == 0x0a || (*str == '\\' && info->is_newline_accepted)) {
             info->newLine();
             str++;

diff --git a/src/ScriptParser.h b/src/ScriptParser.h
@@ -102,9 +102,9 @@ class ScriptParser {
 #ifdef MACOSX
     void checkBundled();
     bool isBundled() {return is_bundled; }
-    pstring bundleResPath() { return bundle_res_path; }
-    pstring bundleAppPath() { return bundle_app_path; }
-    pstring bundleAppName() { return bundle_app_name; }
+    const pstring& bundleResPath() { return bundle_res_path; }
+    const pstring& bundleAppPath() { return bundle_app_path; }
+    const pstring& bundleAppName() { return bundle_app_name; }
 #endif
 
     /* Command */