Skip to content

[pull] main from FreeRTOS:main #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Jul 15, 2026
Merged

[pull] main from FreeRTOS:main #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e199e6
Fix: strncpy() may leave pcWriteBuffer non-null-terminated in FreeRTO…
ARYA-mgc Jul 15, 2026
6f81e4e
fix: parse TCP echo IPv4 address into IPv4 field
aineoae86-sys Jun 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...-Plus/Demo/FreeRTOS_Plus_TCP_IPv6_Demo/IPv6_Multi_WinSim_demo/TCPEchoClient_SingleTasks.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@
}
else
{
rc = FreeRTOS_inet_pton( FREERTOS_AF_INET4, configECHO_SERVER_ADDR_STRING, ( void * ) xEchoServerAddress.sin_address.xIP_IPv6.ucBytes );
rc = FreeRTOS_inet_pton( FREERTOS_AF_INET4, configECHO_SERVER_ADDR_STRING, ( void * ) &( xEchoServerAddress.sin_address.ulIP_IPv4 ) );
configASSERT( rc == pdPASS );
xFamily = FREERTOS_AF_INET4;
}
Expand Down
3 changes: 3 additions & 0 deletions FreeRTOS-Plus/Source/FreeRTOS-Plus-CLI/FreeRTOS_CLI.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ BaseType_t FreeRTOS_CLIProcessCommand( const char * const pcCommandInput,
/* The command was found, but the number of parameters with the command
* was incorrect. */
strncpy( pcWriteBuffer, "Incorrect command parameter(s). Enter \"help\" to view a list of available commands.\r\n\r\n", xWriteBufferLen );
pcWriteBuffer[ xWriteBufferLen - 1 ] = '\0';
pxCommand = NULL;
}
else if( pxCommand != NULL )
Expand All @@ -220,6 +221,7 @@ BaseType_t FreeRTOS_CLIProcessCommand( const char * const pcCommandInput,
{
/* pxCommand was NULL, the command was not found. */
strncpy( pcWriteBuffer, "Command not recognised. Enter 'help' to view a list of available commands.\r\n\r\n", xWriteBufferLen );
pcWriteBuffer[ xWriteBufferLen - 1 ] = '\0';
xReturn = pdFALSE;
}

Expand Down Expand Up @@ -340,6 +342,7 @@ static BaseType_t prvHelpCommand( char * pcWriteBuffer,
/* Return the next command help string, before moving the pointer on to
* the next command in the list. */
strncpy( pcWriteBuffer, pxCommand->pxCommandLineDefinition->pcHelpString, xWriteBufferLen );
pcWriteBuffer[ xWriteBufferLen - 1 ] = '\0';
pxCommand = pxCommand->pxNext;

if( pxCommand == NULL )
Expand Down
Loading