From 3433fc6f95972cec15a7da6e64e8607ebeffc897 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Sun, 3 Sep 2023 00:15:43 +0200
Subject: [PATCH] Fix nfc and fuzzer dynamic naming

---
 applications/external/multi_fuzzer/fuzzer_i.h      | 2 +-
 applications/main/nfc/scenes/nfc_scene_save_name.c | 6 +++---
 lib/nfc/nfc_device.h                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applications/external/multi_fuzzer/fuzzer_i.h b/applications/external/multi_fuzzer/fuzzer_i.h
index 3b7311b2c..e1960a3aa 100644
--- a/applications/external/multi_fuzzer/fuzzer_i.h
+++ b/applications/external/multi_fuzzer/fuzzer_i.h
@@ -25,7 +25,7 @@
 #include <assets_icons.h>
 
 #define FUZZ_TIME_DELAY_MAX (80)
-#define KEY_NAME_SIZE 22
+#define KEY_NAME_SIZE 24
 
 typedef struct {
     const char* custom_dict_extension;
diff --git a/applications/main/nfc/scenes/nfc_scene_save_name.c b/applications/main/nfc/scenes/nfc_scene_save_name.c
index 06d94ebb5..09a7473b8 100644
--- a/applications/main/nfc/scenes/nfc_scene_save_name.c
+++ b/applications/main/nfc/scenes/nfc_scene_save_name.c
@@ -25,7 +25,7 @@ void nfc_scene_save_name_on_enter(void* context) {
         furi_string_replace_all(prefix, " ", "_");
         furi_string_left(prefix, 12);
         name_generator_make_auto(
-            nfc->text_store, NFC_DEV_NAME_MAX_LEN, furi_string_get_cstr(prefix));
+            nfc->text_store, sizeof(nfc->text_store), furi_string_get_cstr(prefix));
         furi_string_free(prefix);
         dev_name_empty = true;
     } else {
@@ -37,7 +37,7 @@ void nfc_scene_save_name_on_enter(void* context) {
         nfc_scene_save_name_text_input_callback,
         nfc,
         nfc->text_store,
-        NFC_DEV_NAME_MAX_LEN,
+        sizeof(nfc->text_store),
         dev_name_empty);
 
     FuriString* folder_path;
@@ -71,7 +71,7 @@ bool nfc_scene_save_name_on_event(void* context, SceneManagerEvent event) {
                (!scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSetTypeMfUid))) {
                 nfc->dev->dev_data.nfc_data = nfc->dev_edit_data;
             }
-            strlcpy(nfc->dev->dev_name, nfc->text_store, strlen(nfc->text_store) + 1);
+            strlcpy(nfc->dev->dev_name, nfc->text_store, sizeof(nfc->dev->dev_name));
             if(nfc_save_file(nfc)) {
                 scene_manager_next_scene(nfc->scene_manager, NfcSceneSaveSuccess);
                 if(!scene_manager_has_previous_scene(nfc->scene_manager, NfcSceneSavedMenu)) {
diff --git a/lib/nfc/nfc_device.h b/lib/nfc/nfc_device.h
index 79429e7cb..1d1751478 100644
--- a/lib/nfc/nfc_device.h
+++ b/lib/nfc/nfc_device.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-#define NFC_DEV_NAME_MAX_LEN 31
+#define NFC_DEV_NAME_MAX_LEN 22
 #define NFC_READER_DATA_MAX_SIZE 64
 #define NFC_DICT_KEY_BATCH_SIZE 10