Sync with Main Branch

[LakshminarayananShenbagaraj]

Sync with Main Branch

The fix is to ensure that each call to strncat never appends more than the free space left in the destination buffer, including reserving space for the terminating null byte.

• For all calls of the form strncat(MarkerArguments, src, sizeof(MarkerArguments)), replace the last argument with the available free space: BUFFER_LENGTH_256 - strlen(MarkerArguments) - 1.
• Because multiple appends occur in sequence, we must recalculate the remaining space after each append.
• To avoid repeatedly recalculating, store size_t remaining = BUFFER_LENGTH_256 - strlen(MarkerArguments) - 1; before each strncat call, and before each strncat call recalculate the space.
• Only append if there is sufficient space left—use checks and possibly truncate the string to fit.
• Add a utility function to perform safe append: this can be placed in the same file if desired, to avoid unsafe calls everywhere.

Required changes:

• Replace all unsafe strncat calls at lines 14, 16, 17, and 18 inside wanmgr_telemetry_append_key_value to use correct free space calculation.
• Optionally add an internal helper function for safe append, or inline the logic.

No additional library imports are needed, as standard C library suffices.

---

To fix this problem, we must ensure that no calls to strncat can overflow the MarkerArguments buffer. For each call, calculate exactly how much space is left in the buffer (after the current length and allowing for the terminating null), and pass at most that number of bytes to strncat. For best robustness, all calls to strncat for MarkerArguments should become:

strncat(MarkerArguments, src, BUFFER_LENGTH_256 - strlen(MarkerArguments) - 1);

This ensures that at most one less than the total buffer (allowing for the null terminator) is appended, from wherever the current content is at.
We should replace all four calls in wanmgr_telemetry_append_key_value (lines 14, 16, 17, 18) accordingly. No new imports or methods are needed; only the third argument to strncat should be changed. The change applies to the function in source/WanManager/wanmgr_t2_telemetry.c. No other code or structure needs modifying.

To fix this problem, each call to strncat must be provided with a size argument that reflects only the remaining space in the MarkerArguments buffer (excluding the current filled length and reserving a byte for the null terminator), rather than always using sizeof(MarkerArguments).

In practical terms, for each call to append a string to MarkerArguments, calculate the current length as strlen(MarkerArguments), then use the remaining length as sizeof(MarkerArguments) - strlen(MarkerArguments) - 1 as the third argument to strncat.

• Only update calls to strncat within the wanmgr_telemetry_append_key_value function, precisely those lines (14, 16, 17, 18).
• To be efficient and readable, compute the remaining buffer space at the start of each append step and use that value for the corresponding strncat call.
• Since the delimiter/key/value strings could individually overflow the buffer, add a check to ensure that the buffer is not already full before a given append or, if desired, prevent adding further key-value pairs if not enough space remains (already partially handled by the line 10 guard).
• No extra imports or definitions are required: all logic can be implemented with existing C standard library functions already in scope.

---

To fix the problem, update all calls to strncat in wanmgr_telemetry_append_key_value so that the third argument is the amount of space left in MarkerArguments minus 1 (to ensure space for the null terminator). Specifically, for each append, calculate the remaining capacity as sizeof(MarkerArguments) - strlen(MarkerArguments) - 1, and pass this as the third argument to strncat.

Change only the calls in this function:

• Line 14: from strncat(MarkerArguments,WANMGR_T2_TELEMETRY_MARKER_ARG_DELIMITER,sizeof(MarkerArguments));
• Line 16: from strncat(MarkerArguments,key,sizeof(MarkerArguments));
• Line 17: from strncat(MarkerArguments,WANMGR_T2_TELEMETRY_MARKER_KEY_VALUE_DELIMITER,sizeof(MarkerArguments));
• Line 18: from strncat(MarkerArguments,value,sizeof(MarkerArguments));

Replace each with a calculation of remaining room, using a helper inline or local variable.

No new imports or methods are needed.

---