WIP: mod: applications/zpc/components/zwave/zwave_controller/src/zwave_controller_utils.c (main)

Signed-off-by: Philippe Coval <[email protected]>

Author: rzr

applications/zpc/components/zwave/zwave_controller/src/zwave_controller_utils.c

@@ -12,6 +12,7 @@
  *****************************************************************************/
 
 //Generic includes
+#include <assert.h>
 #include <stdlib.h>
 #include <stdio.h>
 
@@ -118,34 +119,38 @@ void zwave_sl_log_nif_data(zwave_node_id_t node_id,
   char message[DEBUG_MESSAGE_BUFFER_LENGTH];
   uint16_t index = 0;
 
-  int n = snprintf(message + index,
-                   sizeof(message) - index,
-                   "NIF from NodeID: %d",
-                   node_id);
-  if (n < 0 || n >= (int)(sizeof(message) - index)) {
-    break;
+  int written = snprintf(message + index,
+                         sizeof(message) - index,
+                         "NIF from NodeID: %d",
+                         node_id);
+  if (written < 0 || written >= (int)(sizeof(message) - index)) {
+    sl_log_error(LOG_TAG, "Buffer overflow prevented while writing message.");
+    assert(false);
   }
-  index += n;
-
-  n = snprintf(message + index,
-               sizeof(message) - index,
-               " Capability/Security bytes: 0x%02X 0x%02X - ",
-               node_info->listening_protocol,
-               node_info->optional_protocol);
-  if (n < 0 || n >= (int)(sizeof(message) - index)) {
-    break;
+  index += written;
+
+  written = snprintf(message + index,
+                     sizeof(message) - index,
+                     " Capability/Security bytes: 0x%02X 0x%02X - ",
+                     node_info->listening_protocol,
+                     node_info->optional_protocol);
+  if (written < 0 || written >= (int)(sizeof(message) - index)) {
+    sl_log_error(LOG_TAG, "Buffer overflow prevented while writing message.");
+    assert(false);
   }
-  index += n;
+  index += written;
 
   if (node_info->optional_protocol
       & ZWAVE_NODE_INFO_OPTIONAL_PROTOCOL_CONTROLLER_MASK) {
-    n = snprintf(message + index,
-                 sizeof(message) - index,
-                 "The node is a controller - ");
-    if (n < 0 || n >= (int)(sizeof(message) - index)) {
-      break;
+    written = snprintf(message + index,
+                       sizeof(message) - index,
+                       "The node is a controller - ");
+    if (written < 0 || written >= (int)(sizeof(message) - index)) {
+      sl_log_error(LOG_TAG, "Buffer overflow prevented while writing message.");
+      assert(false);
     }
-    index += n;
+    index += written;
+
   } else {
     index += snprintf(message + index,
                       sizeof(message) - index,
@@ -154,11 +159,13 @@ void zwave_sl_log_nif_data(zwave_node_id_t node_id,
 
   if (node_info->listening_protocol
       & ZWAVE_NODE_INFO_LISTENING_PROTOCOL_LISTENING_MASK) {
-    n = snprintf(message + index, sizeof(message) - index, "AL mode - ");
-    if (n < 0 || n >= (int)(sizeof(message) - index)) {
-      break;
+    written = snprintf(message + index, sizeof(message) - index, "AL mode - ");
+    if (written < 0 || written >= (int)(sizeof(message) - index)) {
+      sl_log_error(LOG_TAG, "Buffer overflow prevented while writing message.");
+      assert(false);
     }
-    index += n;
+    index += written;
+
   } else if (node_info->optional_protocol
              & (ZWAVE_NODE_INFO_OPTIONAL_PROTOCOL_SENSOR_1000MS_MASK
                 | ZWAVE_NODE_INFO_OPTIONAL_PROTOCOL_SENSOR_250MS_MASK)) {
@@ -180,14 +187,15 @@ void zwave_sl_log_nif_data(zwave_node_id_t node_id,
                     node_info->specific_device_class);
 
   for (uint8_t i = 0; i < node_info->command_class_list_length; i++) {
-    n = snprintf(message + index,
-                 sizeof(message) - index,
-                 "%02X ",
-                 node_info->command_class_list[i]);
-    if (n < 0 || n >= (int)(sizeof(message) - index)) {
-      break;
+    written = snprintf(message + index,
+                       sizeof(message) - index,
+                       "%02X ",
+                       node_info->command_class_list[i]);
+    if (written < 0 || written >= (int)(sizeof(message) - index)) {
+      sl_log_error(LOG_TAG, "Buffer overflow prevented while writing message.");
+      assert(false);
     }
-    index += n;
+    index += written;
   }
 
   sl_log_debug(LOG_TAG, "%s", message);