Skip to content

prevent buffer overflow from input string #9

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

Open
rd-blue wants to merge 1 commit into
base: master
Choose a base branch
from
Open

prevent buffer overflow from input string #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 13 additions & 10 deletions Src/UART_CLI.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ uint8_t rx_ready = 0;
uint8_t console_start = 0;
uint8_t command_order = 0;

char firmwareVersion[9] = "v1.8";
char firmwareVersion[9] = "v1.81";

/* FreeRTOS+IO includes. */

Expand All @@ -87,6 +87,9 @@ char firmwareVersion[9] = "v1.8";
/* Dimensions the buffer into which input characters are placed. */
#define cmdMAX_INPUT_SIZE 50

/* Dimensions the temp buffer */
#define TEMP_MESSAGE_SIZE 50

/* Place holder for calls to ioctl that don't use the value parameter. */
#define cmdPARAMTER_NOT_USED ( ( void * ) 0 )

Expand Down Expand Up @@ -221,7 +224,7 @@ static void prvUARTCommandConsoleTask(void const * pvParameters)
to be executed again. */
if (cInputIndex == 0)
{
strcpy((char *) cInputString, (char *) cLastInputString);
strncpy((char *) cInputString, (char *) cLastInputString, cmdMAX_INPUT_SIZE);
}

/* Pass the received command to the command interpreter. The
Expand Down Expand Up @@ -256,7 +259,7 @@ static void prvUARTCommandConsoleTask(void const * pvParameters)
Clear the input string ready to receive the next command. Remember
the command that was just processed first in case it is to be
processed again. */
strcpy((char *) cLastInputString, (char *) cInputString);
strncpy((char *) cLastInputString, (char *) cInputString, cmdMAX_INPUT_SIZE);
cInputIndex = 0;
memset(cInputString, 0x00, cmdMAX_INPUT_SIZE);

Expand Down Expand Up @@ -290,7 +293,7 @@ static void prvUARTCommandConsoleTask(void const * pvParameters)
string will be passed to the command interpreter. */
if ((cRxedChar >= ' ') && (cRxedChar <= '~'))
{
if (cInputIndex < cmdMAX_INPUT_SIZE)
if (cInputIndex < cmdMAX_INPUT_SIZE-1)
{
cInputString[cInputIndex] = cRxedChar;
cInputIndex++;
Expand Down Expand Up @@ -977,10 +980,10 @@ static portBASE_TYPE prvStatusRPi(int8_t *pcWriteBuffer, size_t xWriteBufferLen,
uint32_t time;
uint32_t date;
uint8_t alarm_mode_tmp;
uint8_t alarm_time_tmp;
uint8_t alarm_date_tmp;
uint8_t alarm_weekday_tmp;
uint8_t alarm__tmp;
// uint8_t alarm_time_tmp;
// uint8_t alarm_date_tmp;
// uint8_t alarm_weekday_tmp;
// uint8_t alarm__tmp;

RTC_TimeTypeDef stimestructureget;
RTC_DateTypeDef sdatestructureget;
Expand Down Expand Up @@ -1126,7 +1129,7 @@ static portBASE_TYPE prvShowStatus(int8_t *pcWriteBuffer, size_t xWriteBufferLen

sprintf((char *) pcWriteBuffer, "\r\n Time: %02d:%02d:%02d", stimestructureget.Hours, stimestructureget.Minutes, stimestructureget.Seconds);

char temp_message[20];
char temp_message[TEMP_MESSAGE_SIZE];

switch (sdatestructureget.WeekDay)
{
Expand Down Expand Up @@ -1333,7 +1336,7 @@ static portBASE_TYPE prvShowAlarm(int8_t *pcWriteBuffer, size_t xWriteBufferLen,

sprintf((char *) pcWriteBuffer, "\r\n Time: %02d:%02d:%02d", stimestructureget.Hours, stimestructureget.Minutes, stimestructureget.Seconds);

char temp_message[21];
char temp_message[TEMP_MESSAGE_SIZE];

switch (sdatestructureget.WeekDay)
{
Expand Down