dali/bacnet_stack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored all the sprintf to use snprintf instead. (#628)

Browse Source
This commit is contained in:
Steve Karg
2024-04-27 12:41:45 -05:00
committed by GitHub
parent 70c54817fd
commit bb276e2431
46 changed files with 308 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/mstpcrc/main.c
+4 -4
View File
@@ -154,7 +154,7 @@ static void Parse_Arguments(int argc, char *argv[])
}
}
static void filename_create(char *filename)
static void filename_create(char *filename, size_t filesize)
{
time_t my_time;
struct tm *today;
@@ -162,7 +162,7 @@ static void filename_create(char *filename)
if (filename) {
my_time = time(NULL);
today = localtime(&my_time);
sprintf(filename, "mstp_%04d%02d%02d%02d%02d%02d.cap",
snprintf(filename, filesize, "mstp_%04d%02d%02d%02d%02d%02d.cap",
1900 + today->tm_year, 1 + today->tm_mon, today->tm_mday,
today->tm_hour, today->tm_min, today->tm_sec);
}
@@ -223,7 +223,7 @@ static void write_received_packet(uint8_t *buffer, unsigned length)
static void Write_Pcap(uint8_t *buffer, unsigned length)
{
filename_create(&Capture_Filename[0]);
filename_create(&Capture_Filename[0], sizeof(Capture_Filename));
write_global_header(&Capture_Filename[0]);
write_received_packet(buffer, length);
if (pFile) {
@@ -236,7 +236,7 @@ static void Process_Text_File(void)
{
char *argi = NULL;
filename_create(&Capture_Filename[0]);
filename_create(&Capture_Filename[0], sizeof(Capture_Filename));
write_global_header(&Capture_Filename[0]);
while (fgets(Text_Buffer, sizeof(Text_Buffer), pText_File)) {
CRC_Buffer_Len = 0;
apps/perl/perl_bindings.c
+11 -11
View File
@@ -66,7 +66,7 @@ static void MyAbortHandler(
if (address_match(&Target_Address, src) &&
(invoke_id == Request_Invoke_ID)) {
char msg[MAX_ERROR_STRING];
sprintf(msg, "BACnet Abort: %s",
snprintf(msg, sizeof(msg), "BACnet Abort: %s",
bactext_abort_reason_name((int)abort_reason));
LogError(msg);
}
@@ -78,7 +78,7 @@ static void MyRejectHandler(
if (address_match(&Target_Address, src) &&
(invoke_id == Request_Invoke_ID)) {
char msg[MAX_ERROR_STRING];
sprintf(msg, "BACnet Reject: %s",
snprintf(msg, sizeof(msg), "BACnet Reject: %s",
bactext_reject_reason_name((int)reject_reason));
LogError(msg);
}
@@ -92,7 +92,7 @@ static void My_Error_Handler(BACNET_ADDRESS *src,
if (address_match(&Target_Address, src) &&
(invoke_id == Request_Invoke_ID)) {
char msg[MAX_ERROR_STRING];
sprintf(msg, "BACnet Error: %s: %s",
snprintf(msg, sizeof(msg), "BACnet Error: %s: %s",
bactext_error_class_name((int)error_class),
bactext_error_code_name((int)error_code));
LogError(msg);
@@ -211,7 +211,7 @@ void rpm_ack_extract_data(BACNET_READ_ACCESS_DATA *rpm_data)
}
} else {
/* AccessError */
sprintf(ackString, "BACnet Error: %s: %s",
snprintf(ackString, sizeof(ackString), "BACnet Error: %s: %s",
bactext_error_class_name(
(int)listOfProperties->error.error_class),
bactext_error_code_name(
@@ -251,13 +251,13 @@ static void AtomicReadFileAckHandler(uint8_t *service_request,
uint8_t *pFileData;
int i;
sprintf(msg, "EOF=%d,start=%d,", data.endOfFile,
snprintf(msg, sizeof(msg), "EOF=%d,start=%d,", data.endOfFile,
data.type.stream.fileStartPosition);
__LogAnswer(msg, 0);
pFileData = octetstring_value(&data.fileData);
for (i = 0; i < octetstring_length(&data.fileData); i++) {
sprintf(msg, "%02x ", *pFileData);
snprintf(msg, sizeof(msg), "%02x ", *pFileData);
__LogAnswer(msg, 1);
pFileData++;
}
@@ -710,14 +710,14 @@ int BacnetWriteProperty(int deviceInstanceNumber,
property_tag = strtol(tag, NULL, 0);
if (property_tag >= MAX_BACNET_APPLICATION_TAG) {
sprintf(msg, "Error: tag=%u - it must be less than %u",
snprintf(msg, sizeof(msg), "Error: tag=%u - it must be less than %u",
property_tag, MAX_BACNET_APPLICATION_TAG);
LogError(msg);
break;
}
if (!bacapp_parse_application_data(
property_tag, value, &propertyValue)) {
sprintf(msg, "Error: unable to parse the tag value");
snprintf(msg, sizeof(msg), "Error: unable to parse the tag value");
LogError(msg);
break;
}
@@ -883,11 +883,11 @@ int BacnetTimeSync(int deviceInstanceNumber,
bytes_sent = datalink_send_pdu(
&Target_Address, &npdu_data, &Handler_Transmit_Buffer[0], pdu_len);
if (bytes_sent <= 0) {
char errorMsg[64];
sprintf(errorMsg,
char msg[64];
snprintf(msg, sizeof(msg),
"Failed to Send Time-Synchronization Request (%s)!",
strerror(errno));
LogError(errorMsg);
LogError(msg);
break;
}