1 files changed, 6 insertions, 2 deletions
diff --git a/src/components/ble/AlertNotificationService.cpp b/src/components/ble/AlertNotificationService.cpp
index 0639119c..d91e2090 100644
--- a/src/components/ble/AlertNotificationService.cpp
+++ b/src/components/ble/AlertNotificationService.cpp
@@ -66,8 +66,11 @@ int AlertNotificationService::OnAlert(uint16_t conn_handle, uint16_t attr_handle
     const auto maxMessageSize {NotificationManager::MaximumMessageSize()};
     const auto maxBufferSize{maxMessageSize + headerSize};
 
-    const auto dbgPacketLen = OS_MBUF_PKTLEN(ctxt->om);
-    size_t bufferSize = std::min(dbgPacketLen + stringTerminatorSize, maxBufferSize);
+    // Ignore notifications with empty message
+    const auto packetLen = OS_MBUF_PKTLEN(ctxt->om);
+    if(packetLen <= headerSize) return 0;
+
+    size_t bufferSize = std::min(packetLen + stringTerminatorSize, maxBufferSize);
     auto messageSize = std::min(maxMessageSize, (bufferSize-headerSize));
     Categories category;
 
@@ -75,6 +78,7 @@ int AlertNotificationService::OnAlert(uint16_t conn_handle, uint16_t attr_handle
     os_mbuf_copydata(ctxt->om, headerSize, messageSize-1, notif.message.data());
     os_mbuf_copydata(ctxt->om, 0, 1, &category);
     notif.message[messageSize-1] = '\0';
+    notif.size = messageSize;
 
     // TODO convert all ANS categories to NotificationController categories
     switch(category) {