From d41de537a0e31e1c5ad18b5024c781f6e4a07bbb Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Mon, 31 Jul 2023 12:19:04 +1000
Subject: [PATCH] fix libtags m4a issue

---
 lib/libtags/tags.c          | 3 ++-
 src/database/tag_parser.cpp | 6 ------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/lib/libtags/tags.c b/lib/libtags/tags.c
index 6c6b2b55..a027a9ab 100644
--- a/lib/libtags/tags.c
+++ b/lib/libtags/tags.c
@@ -46,7 +46,8 @@ tagscallcb(Tagctx *ctx, int type, const char *k, char *s, int offset, int size,
 		e = s + strlen(s);
 		while(e != s && (uchar)e[-1] <= ' ')
 			e--;
-		*e = 0;
+		if (*e != 0)
+			*e = 0;
 	}
 	if(*s){
 		ctx->tag(ctx, type, k, s, offset, size, f);
diff --git a/src/database/tag_parser.cpp b/src/database/tag_parser.cpp
index 3d3df7e8..2faf3408 100644
--- a/src/database/tag_parser.cpp
+++ b/src/database/tag_parser.cpp
@@ -113,12 +113,6 @@ auto TagParserImpl::ReadAndParseTags(const std::string& path, TrackTags* out)
     }
   }
 
-  if (path.ends_with(".m4a")) {
-    // TODO(jacqueline): Re-enabled once libtags is fixed.
-    ESP_LOGW(kTag, "skipping m4a %s", path.c_str());
-    return false;
-  }
-
   libtags::Aux aux;
   aux.tags = out;
   if (f_stat(path.c_str(), &aux.info) != FR_OK ||