4 files changed, 11 insertions, 8 deletions

diff --git a/apps/playlist.c b/apps/playlist.c
index 62f85eab40..dcf2fe1118 100644
--- a/apps/playlist.c
+++ b/apps/playlist.c
@@ -1353,8 +1353,8 @@ static int get_filename(struct playlist_info* playlist, int index, int seek,
     {
         if (playlist->filenames[index] != NULL)
         {
-            dircache_copy_path(playlist->filenames[index], tmp_buf, sizeof(tmp_buf)-1);
-            max = strlen(tmp_buf);
+            max = dircache_copy_path(playlist->filenames[index],
+                                     tmp_buf, sizeof(tmp_buf)-1);
         }
     }
 #else
diff --git a/apps/tagcache.c b/apps/tagcache.c
index 0c85fc5957..080f4198c3 100644
--- a/apps/tagcache.c
+++ b/apps/tagcache.c
@@ -1481,10 +1481,10 @@ static bool get_next(struct tagcache_search *tcs)
         if (tcs->type == tag_filename && (flag & FLAG_DIRCACHE)
             && is_dircache_intact())
         {
-            dircache_copy_path((struct dircache_entry *)tcs->position,
+            size_t len = dircache_copy_path((struct dircache_entry *)tcs->position,
                                buf, sizeof buf);
+            tcs->result_len = len + 1;
             tcs->result = buf;
-            tcs->result_len = strlen(buf) + 1;
             tcs->ramresult = false;
             
             return true;
diff --git a/firmware/common/dircache.c b/firmware/common/dircache.c
index dc662bb9cd..3eae85ee3b 100644
--- a/firmware/common/dircache.c
+++ b/firmware/common/dircache.c
@@ -932,16 +932,19 @@ static size_t copy_path_helper(const struct dircache_entry *entry, char *buf, si
 /**
  * Function to copy the full absolute path from dircache to the given buffer
  * using the given dircache_entry pointer.
+ *
+ * Returns the size of the resulting string, or 0 if an error occured
  */
-void dircache_copy_path(const struct dircache_entry *entry, char *buf, int size)
+size_t dircache_copy_path(const struct dircache_entry *entry, char *buf, size_t size)
 {
-    if (size <= 0 || !buf)
-        return ;
+    if (!size || !buf)
+        return 0;
 
     buf[0] = '/';
     size_t res = copy_path_helper(entry, buf, size);
     /* fixup trailing '/' */
     buf[res] = '\0';
+    return res;
 }
 
 /* --- Directory cache live updating functions --- */
diff --git a/firmware/include/dircache.h b/firmware/include/dircache.h
index 49e804c7f1..716d1fbed2 100644
--- a/firmware/include/dircache.h
+++ b/firmware/include/dircache.h
@@ -100,7 +100,7 @@ int dircache_get_reserve_used(void);
 int dircache_get_build_ticks(void);
 void dircache_disable(void);
 const struct dircache_entry *dircache_get_entry_ptr(const char *filename);
-void dircache_copy_path(const struct dircache_entry *entry, char *buf, int size);
+size_t dircache_copy_path(const struct dircache_entry *entry, char *buf, size_t size);
 
 void dircache_bind(int fd, const char *path);
 void dircache_update_filesize(int fd, long newsize, long startcluster);