3 files changed, 7 insertions, 3 deletions

diff --git a/apps/gui/gwps-common.c b/apps/gui/gwps-common.c
index fe7e1ed979..4032d8b861 100644
--- a/apps/gui/gwps-common.c
+++ b/apps/gui/gwps-common.c
@@ -398,8 +398,11 @@ bool update(struct gui_wps *gwps)
         }
 
         if (gwps->state->id3)
-            memcpy(gwps->state->current_track_path, gwps->state->id3->path,
+        {
+            strncpy(gwps->state->current_track_path, gwps->state->id3->path,
                    sizeof(gwps->state->current_track_path));
+            gwps->state->current_track_path[sizeof(gwps->state->current_track_path)-1] = '\0';
+        }
     }
 
     if (gwps->state->id3)
diff --git a/apps/gui/gwps.c b/apps/gui/gwps.c
index c0fe24f04c..d726daef3f 100644
--- a/apps/gui/gwps.c
+++ b/apps/gui/gwps.c
@@ -728,8 +728,9 @@ void wps_state_update_id3_nid3(struct mp3entry *id3, struct mp3entry *nid3)
 
 static void wps_state_update_ctp(const char *path)
 {
-    memcpy(wps_state.current_track_path, path,
+    strncpy(wps_state.current_track_path, path,
            sizeof(wps_state.current_track_path));
+    wps_state.current_track_path[sizeof(wps_state.current_track_path)-1] = '\0';
 }
 /* wps_state end*/
 
diff --git a/apps/gui/gwps.h b/apps/gui/gwps.h
index ab8258147e..cfa7e70714 100644
--- a/apps/gui/gwps.h
+++ b/apps/gui/gwps.h
@@ -378,7 +378,7 @@ struct wps_state
     bool wps_time_countup;
     struct mp3entry* id3;
     struct mp3entry* nid3;
-    char current_track_path[MAX_PATH+1];
+    char current_track_path[MAX_PATH];
 };