Merge pull request #24 from leedave/feature/fix_furi_string_release_s…

…torage Furi String free in storage if things fail
leedave · Jul 19, 2024 · d2cdc43 · d2cdc43
2 parents 2fb827d + 3212a77
commit d2cdc43
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -40,6 +40,7 @@ This code is open-source and may be used for whatever you want to do with it.
 - [Flipc](flipc.org) for distributing the boilerplate
 - [Nikita Vostokov](https://github.com/wosk) for code contributions
 - [Alexander Rodriguez](https://github.com/squee72564) for code contributions
+- [derskythe](https://github.com/derskythe) for code contributions
 
 ## Some cool projects I found using this 
 (love seeing it being used. Let me know if you want yours added)<br>

diff --git a/application.fam b/application.fam
@@ -13,5 +13,5 @@ App(
     fap_icon="icons/boilerplate_10px.png",
     fap_icon_assets="icons",
     fap_category="Misc",
-    fap_version="1.1",
+    fap_version="1.2",
 )
diff --git a/boilerplate.h b/boilerplate.h
@@ -24,7 +24,7 @@
 
 #define SUBGHZ_APP_EXTENSION ".sub"
 #define SUBGHZ_APP_FOLDER ANY_PATH("subghz")
-#define BOILERPLATE_VERSION "1.1"
+#define BOILERPLATE_VERSION "1.2"
 
 typedef struct {
     Gui* gui;

diff --git a/docs/changelog.md b/docs/changelog.md
@@ -1,3 +1,6 @@
+## 1.2
+- Added fixed to clear furi_string on storage if things fail (found by derskythe)
+
 ## 1.1
 - Add Version to Startscreen
 - Fixed crash after furi_check on fw 0.100.3

diff --git a/helpers/boilerplate_storage.c b/helpers/boilerplate_storage.c
@@ -86,13 +86,15 @@ void boilerplate_read_settings(void* context) {
         FURI_LOG_E(TAG, "Cannot open file %s", BOILERPLATE_SETTINGS_SAVE_PATH);
         boilerplate_close_config_file(fff_file);
         boilerplate_close_storage();
+        furi_string_free(temp_str);
         return;
     }
 
     if(!flipper_format_read_header(fff_file, temp_str, &file_version)) {
         FURI_LOG_E(TAG, "Missing Header Data");
         boilerplate_close_config_file(fff_file);
         boilerplate_close_storage();
+        furi_string_free(temp_str);
         return;
     }