Skip to content

fix: the sms response buffer handling in sm_at_sms in sm_at_sms.c #294

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
orbisai0security wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: the sms response buffer handling in sm_at_sms in sm_at_sms.c #294

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
20 changes: 12 additions & 8 deletions app/src/sm_at_sms.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@ static void sms_concat_handle(struct sms_data *const data)
goto done;
}
if (header->concatenated.seq_number == 1) {
sprintf(sms_ctx.concat_rsp_buf,
snprintf(sms_ctx.concat_rsp_buf,
SM_SMS_AT_HEADER_INFO_MAX_LEN + SMS_MAX_PAYLOAD_LEN_CHARS,
"\r\n#XSMS: \"%02d-%02d-%02d %02d:%02d:%02d "
"UTC%+03d:%02d\",\"%s\",\"%s",
header->time.year, header->time.month, header->time.day,
Expand All @@ -134,19 +135,22 @@ static void sms_concat_handle(struct sms_data *const data)
header->originating_address.address_str,
data->payload);
} else {
strcpy(sms_ctx.concat_rsp_buf + SM_SMS_AT_HEADER_INFO_MAX_LEN +
(header->concatenated.seq_number - 1) * SMS_MAX_PAYLOAD_LEN_CHARS,
data->payload);
snprintf(sms_ctx.concat_rsp_buf + SM_SMS_AT_HEADER_INFO_MAX_LEN +
(header->concatenated.seq_number - 1) * SMS_MAX_PAYLOAD_LEN_CHARS,
SMS_MAX_PAYLOAD_LEN_CHARS,
"%s", data->payload);
}
sms_ctx.count++;
if (sms_ctx.count == sms_ctx.total_msgs) {
uint16_t buf_size = SM_SMS_AT_HEADER_INFO_MAX_LEN +
SMS_MAX_PAYLOAD_LEN_CHARS * sms_ctx.total_msgs;

for (int i = 1; i < (sms_ctx.total_msgs); i++) {
strncat(sms_ctx.concat_rsp_buf,
strcat_s(sms_ctx.concat_rsp_buf, buf_size,
sms_ctx.concat_rsp_buf + SM_SMS_AT_HEADER_INFO_MAX_LEN +
i * SMS_MAX_PAYLOAD_LEN_CHARS,
SMS_MAX_PAYLOAD_LEN_CHARS);
i * SMS_MAX_PAYLOAD_LEN_CHARS);
}
strcat(sms_ctx.concat_rsp_buf, "\"\r\n");
strcat_s(sms_ctx.concat_rsp_buf, buf_size, "\"\r\n");
urc_send_to(sms_ctx.pipe, "%s", sms_ctx.concat_rsp_buf);
} else {
/* If new messages for the concatenated message are not received
Expand Down