From fc95a892ab3c4aa56c9aa86fb6b0b0a57457f527 Mon Sep 17 00:00:00 2001
From: Roland Dobai <roland@espressif.com>
Date: Mon, 4 Dec 2023 08:59:41 +0100
Subject: [PATCH] fix(tools): Fix fatfsgen construct exception type and
 dependency

construct=2.10.70 fixed an issue
(https://github.com/construct/construct/commit/c3866e949216112e8bdbeb23349ee3e958f9f461)
and StringError is raised instead of UnicodeDecodeError.
---
 components/fatfs/fatfsparse.py           | 2 +-
 tools/requirements/requirements.core.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/components/fatfs/fatfsparse.py b/components/fatfs/fatfsparse.py
index c5d3716c56..de50f2fefa 100755
--- a/components/fatfs/fatfsparse.py
+++ b/components/fatfs/fatfsparse.py
@@ -57,7 +57,7 @@ def traverse_folder_tree(directory_bytes_: bytes,
         try:
             obj_: dict = Entry.ENTRY_FORMAT_SHORT_NAME.parse(
                 directory_bytes_[obj_address_: obj_address_ + FATDefaults.ENTRY_SIZE])
-        except (construct.core.ConstError, UnicodeDecodeError):
+        except (construct.core.ConstError, UnicodeDecodeError, construct.core.StringError):
             args.long_name_support = True
             continue
 
diff --git a/tools/requirements/requirements.core.txt b/tools/requirements/requirements.core.txt
index d1d4c930c2..32097f3436 100644
--- a/tools/requirements/requirements.core.txt
+++ b/tools/requirements/requirements.core.txt
@@ -17,6 +17,7 @@ esp-idf-monitor
 esp-idf-size
 esp-idf-panic-decoder
 pyclang
+construct
 
 # gdb extensions dependencies
 freertos_gdb