Bugfix.

Author: sbarex

CHANGELOG.md

@@ -1,6 +1,13 @@
 # Changelog
 =======
 
+### 1.0.6 (31)
+New features:
+- Application menu item to install/reveal the CLI tool on `/usr/local/bin` folder.
+- Support for UTI `public.markdown` defined by `Nova.app`.
+Bugfix:
+- Fixed possibile deallocation error with invalid highlight theme.
+
 ### 1.0.5 (30)
 Bugfix:
 - Tag Filter extension fixed.

QLMarkdown.xcodeproj/project.pbxproj

@@ -1426,7 +1426,7 @@
 				CODE_SIGN_ENTITLEMENTS = QLExtension/QLExtension.entitlements;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1447,7 +1447,7 @@
 					"$(PROJECT_DIR)/re2",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown.QLExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1464,7 +1464,7 @@
 				CODE_SIGN_ENTITLEMENTS = QLExtension/QLExtension.entitlements;
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				HEADER_SEARCH_PATHS = (
@@ -1485,7 +1485,7 @@
 					"$(PROJECT_DIR)/re2",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown.QLExtension;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1671,7 +1671,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1697,7 +1697,7 @@
 					"$(PROJECT_DIR)/re2",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1718,7 +1718,7 @@
 				CODE_SIGN_IDENTITY = "-";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 30;
+				CURRENT_PROJECT_VERSION = 31;
 				DEVELOPMENT_TEAM = "";
 				ENABLE_HARDENED_RUNTIME = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1744,7 +1744,7 @@
 					"$(PROJECT_DIR)/re2",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.15;
-				MARKETING_VERSION = 1.0.5;
+				MARKETING_VERSION = 1.0.6;
 				PRODUCT_BUNDLE_IDENTIFIER = org.sbarex.QLMarkdown;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

highlight-wrapper/Makefile

@@ -26,10 +26,10 @@ CFLAGS=-Wall -std=c++11 -D_FILE_OFFSET_BITS=64 \
        -I ${BUILD_DIR}
 LDFLAGS=-L${BUILD_DIR}
 
-CFLAGS_x86_64=-mmacosx-version-min=10.15
+CFLAGS_x86_64=-target x86_64-apple-macos10.15
 CFLAGS_arm64=-target arm64-apple-macos11
 
-LDFLAGS_x86_64=
+LDFLAGS_x86_64=-target x86_64-apple-macos10.15
 LDFLAGS_arm64=-target arm64-apple-macos11
 
 ifeq ($(CONFIGURATION),Debug)
@@ -357,4 +357,4 @@ clean: clean_intermediate
 	@rm ${BUILD_DIR}/liblua-arm64.a 2> /dev/null
 	@rm ${BUILD_DIR}/libgoutils.a 2> /dev/null
 	@rm ${BUILD_DIR}/libgoutils-x86_64.a 2> /dev/null
-	@rm ${BUILD_DIR}/libgoutils-arm64.a 2> /dev/null
+	@rm ${BUILD_DIR}/libgoutils-arm64.a 2> /dev/null

highlight-wrapper/wrapper_highlight.cpp

@@ -494,7 +494,6 @@ int highlight_list_themes2(HThemeInfo ***theme_list, int *count, ReleaseThemeInf
     string suffix, desc;
     Diluculum::LuaValueMap categoryMap;
 
-    int matchedFileCnt=0;
     std::set<string> categoryNames;
 
     istringstream valueStream;
@@ -504,9 +503,10 @@ int highlight_list_themes2(HThemeInfo ***theme_list, int *count, ReleaseThemeInf
     int j = 0;
 
     for (const auto& filePath : filePaths) {
+        HThemeInfo *theme;
         try {
-            HThemeInfo *theme = allocate_theme_info();
-
+            theme = allocate_theme_info();
+            
             Diluculum::LuaState ls;
             highlight::SyntaxReader::initLuaState(ls, filePath, "");
             ls.doFile(filePath);
@@ -529,21 +529,20 @@ int highlight_list_themes2(HThemeInfo ***theme_list, int *count, ReleaseThemeInf
             suffix = suffix.substr ( 1, suffix.length()- wildcard.length() );
 
             theme->name = strdup(suffix.c_str());
-            theme->desc = strdup(ls["Description"].value().asString().c_str());
+            theme->desc = strdup(desc.c_str());
             theme->path = strdup(filePath.c_str());
             theme->base16 = filePath.rfind(base_path16, 0) == 0 ? 1 : 0;
 
-
             themes[j] = theme;
             j++;
-
-            matchedFileCnt++;
         } catch (std::runtime_error &error) {
             os_log_error(sLog, "Failed to read '%{public}s': %{public}s", filePath.c_str(), error.what());
+            release_theme_info(theme);
         }
     }
 
     *theme_list = themes;
+    *count = j;
 
     return EXIT_SUCCESS;
 }