3 files changed, 18 insertions, 5 deletions

diff --git a/apps/debug_menu.c b/apps/debug_menu.c
index 87a41920b9..0b0bc8fc2b 100644
--- a/apps/debug_menu.c
+++ b/apps/debug_menu.c
@@ -1627,7 +1627,9 @@ static int ata_smart_attr_to_string(
             if (len >= name_sz) len = name_sz-1;
             slen += len;
         }
-        snprintf(str+slen, size-slen, "%s", buf);
+
+        if (!memccpy (str+slen, buf, '\0', size-slen))
+            (str+slen)[size-slen - 1] = '\0';
     }
 
     return 1; /* ok */
diff --git a/apps/playlist_viewer.c b/apps/playlist_viewer.c
index d2774e67b0..f1f8954113 100644
--- a/apps/playlist_viewer.c
+++ b/apps/playlist_viewer.c
@@ -516,7 +516,10 @@ static enum pv_onplay_result open_with(const struct playlist_entry *current_trac
 {
     char selected_track[MAX_PATH];
     close_playlist_viewer();
-    snprintf(selected_track, sizeof(selected_track), "%s", current_track->name);
+
+    if (!memccpy (selected_track, current_track->name, '\0', sizeof(selected_track)))
+        selected_track[sizeof(selected_track) - 1] = '\0';
+
 
     return (filetype_list_viewers(selected_track) ==
                 PLUGIN_USB_CONNECTED ? PV_ONPLAY_USB_CLOSED : PV_ONPLAY_CLOSED);
@@ -528,7 +531,9 @@ static enum pv_onplay_result open_pictureflow(const struct playlist_entry *curre
 {
     char selected_track[MAX_PATH];
     close_playlist_viewer();
-    snprintf(selected_track, sizeof(selected_track), "%s", current_track->name);
+
+    if (!memccpy (selected_track, current_track->name, '\0', sizeof(selected_track)))
+        selected_track[sizeof(selected_track) - 1] = '\0';
 
     return (filetype_load_plugin((void *)"pictureflow", selected_track) ==
                 PLUGIN_USB_CONNECTED ? PV_ONPLAY_USB_CLOSED : PV_ONPLAY_CLOSED);
diff --git a/apps/screens.c b/apps/screens.c
index 70374a1f08..9191922c31 100644
--- a/apps/screens.c
+++ b/apps/screens.c
@@ -561,7 +561,10 @@ static const char * id3_get_or_speak_info(int selected_item, void* data,
             case LANG_ID3_COMMENT:
                 if (!id3->comment)
                     return NULL;
-                snprintf(buffer, buffer_len, "%s", id3->comment);
+
+                if (!memccpy (buffer, id3->comment, '\0', buffer_len))
+                    buffer[buffer_len - 1] = '\0';
+
                 val=buffer;
                 if(say_it && val)
                     talk_spell(val, true);
@@ -608,7 +611,10 @@ static const char * id3_get_or_speak_info(int selected_item, void* data,
             case LANG_FORMAT:
                 if (id3->codectype >= AFMT_NUM_CODECS)
                     return NULL;
-                snprintf(buffer, buffer_len, "%s", audio_formats[id3->codectype].label);
+
+                if (!memccpy (buffer, audio_formats[id3->codectype].label, '\0', buffer_len))
+                    buffer[buffer_len - 1] = '\0';
+
                 val=buffer;
                 if(say_it)
                     talk_spell(val, true);