[update] Branch develop | Commit c6a909ab389e18c5573b0cbc9cb6eaf931fd…

…db02 [update] Branch develop | Commit 9e247284772bf3f8f87c3ea18c843ce15168543a
LedgerHQ · Apr 12, 2024 · 2bf928b · 2bf928b
1 parent 8fe6572
commit 2bf928b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,7 +5,13 @@
 | :rotating_light:     | Breaks build                  |
 | :warning:            | Breaks compatibility with app |
 
-## [latest](/) - 2024/03/27
+## [latest](/) - 2024/04/12
+
+### Fixed
+
+* Fix potential oob writes in `amountToString`
+
+## [8fe6572](/../../commit/8fe6572) - 2024/03/27
 
 ### Changed
 

diff --git a/src/common_utils.c b/src/common_utils.c
@@ -199,8 +199,11 @@ bool amountToString(const uint8_t *amount,
     uint8_t amount_len = strnlen(tmp_buffer, sizeof(tmp_buffer));
     uint8_t ticker_len = strnlen(ticker, MAX_TICKER_LEN);
 
-    memcpy(out_buffer, ticker, MIN(out_buffer_size, ticker_len));
     if (ticker_len > 0) {
+        if (out_buffer_size <= ticker_len + 1) {
+            return false;
+        }
+        memcpy(out_buffer, ticker, ticker_len);
         out_buffer[ticker_len++] = ' ';
     }