ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

BLE: Fix sprintf overflow in trace helpers.

pull/14198/head
Vincent Coubard 2021-01-27 12:02:30 +00:00 committed by Paul Szczepanek
parent 52a3de6657
commit c674990820
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
connectivity/FEATURE_BLE/source/common/ble_trace_helpers.cpp
View File

@ -46,7 +46,7 @@ const char *ble_error_to_string(ble_error_t error_code)
} }
#else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
static char ret[3] = "00"; static char ret[3] = "00";
sprintf(ret, "0x%02x", (int)error_code); sprintf(ret, "%02x", (int)error_code);
#endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
return ret; return ret;
} }
@ -82,7 +82,7 @@ const char *attribute_error_code_to_string(uint8_t error_code)
} }
#else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
static char ret[3] = "00"; static char ret[3] = "00";
sprintf(ret, "0x%02x", (int)error_code); sprintf(ret, "%02x", (int)error_code);
#endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
return ret; return ret;
} }
@ -118,7 +118,7 @@ const char *att_client_callback_event_to_string(uint8_t code)
} }
#else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
static char ret[3] = "00"; static char ret[3] = "00";
sprintf(ret, "0x%02x", (int)code); sprintf(ret, "%02x", (int)code);
#endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
return ret; return ret;
} }
@ -156,7 +156,7 @@ const char *att_error_code_to_string(uint8_t error_code)
} }
#else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
static char ret[3] = "00"; static char ret[3] = "00";
sprintf(ret, "0x%02x", (int)error_code); sprintf(ret, "%02x", (int)error_code);
#endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
return ret; return ret;
} }
@ -197,7 +197,7 @@ const char *attribute_opcode_to_string(uint8_t error_code)
} }
#else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
static char ret[3] = "00"; static char ret[3] = "00";
sprintf(ret, "0x%02x", (int)error_code); sprintf(ret, "%02x", (int)error_code);
#endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
return ret; return ret;
} }
@ -303,7 +303,7 @@ const char *dm_callback_event_to_string(uint8_t event) {
} }
#else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
static char ret[3] = "00"; static char ret[3] = "00";
sprintf(ret, "0x%02x", (int)event); sprintf(ret, "%02x", (int)event);
#endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
return ret; return ret;
} }
@ -509,8 +509,8 @@ const char *hci_opcode_to_string(uint16_t opcode)
case HCI_OPCODE_LE_SET_TX_POWER_REPORT_ENABLE: ret = "HCI_OPCODE_LE_SET_TX_POWER_REPORT_ENABLE"; break; case HCI_OPCODE_LE_SET_TX_POWER_REPORT_ENABLE: ret = "HCI_OPCODE_LE_SET_TX_POWER_REPORT_ENABLE"; break;
} }
#else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #else // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
static char ret[3] = "00"; static char ret[5] = "0000";
sprintf(ret, "0x%02x", (int)opcode); sprintf(ret, "%04x", opcode);
#endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS #endif // MBED_CONF_BLE_TRACE_HUMAN_READABLE_ENUMS
return ret; return ret;
} }