diff options
author | Adam Pigg <adam@piggz.co.uk> | 2020-07-11 21:41:20 +0100 |
---|---|---|
committer | Adam Pigg <adam@piggz.co.uk> | 2020-07-11 21:41:20 +0100 |
commit | 789e06fdb77704fa5da12355ad5f1d8c9d4455e5 (patch) | |
tree | 56972f902675749e0df58e91d8670dd5215d677e /src/Components/Ble/NotificationManager.cpp | |
parent | 7a1e6e6e5bf187846bd533f04ee58e04798f0035 (diff) | |
parent | 6309719a62436fd746a7a8b228205e93b419ca26 (diff) |
Merge branch 'develop' of https://github.com/JF002/Pinetime into music
Diffstat (limited to 'src/Components/Ble/NotificationManager.cpp')
-rw-r--r-- | src/Components/Ble/NotificationManager.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Components/Ble/NotificationManager.cpp b/src/Components/Ble/NotificationManager.cpp index 2e02cb15..0aea0697 100644 --- a/src/Components/Ble/NotificationManager.cpp +++ b/src/Components/Ble/NotificationManager.cpp @@ -4,11 +4,12 @@ using namespace Pinetime::Controllers; void NotificationManager::Push(Pinetime::Controllers::NotificationManager::Categories category, - const char *message, uint8_t messageSize) { + const char *message, uint8_t currentMessageSize) { // TODO handle edge cases on read/write index + auto checkedSize = std::min(currentMessageSize, uint8_t{18}); auto& notif = notifications[writeIndex]; - std::memcpy(notif.message.data(), message, messageSize); - notif.message[messageSize] = '\0'; + std::memcpy(notif.message.data(), message, checkedSize); + notif.message[checkedSize] = '\0'; notif.category = category; writeIndex = (writeIndex + 1 < TotalNbNotifications) ? writeIndex + 1 : 0; |