fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-23 17:23:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

mixer test: Fix string handling

Browse Source 
Some strings were not enforcing NUL termination.
This commit is contained in:
Lorenz Meier
2017-01-14 07:47:03 -08:00
parent 1155a4725b
commit b9e32d7a34
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemcmds/tests/test_mixer.cpp
+4 -2
View File
@@ -216,7 +216,9 @@ bool MixerTest::loadAllTest()
if (strncmp(result->d_name, ".", 1) != 0) { if (strncmp(result->d_name, ".", 1) != 0) {
char buf[PATH_MAX]; char buf[PATH_MAX];
(void)strncpy(&buf[0], MIXER_ONBOARD_PATH, sizeof(buf)); (void)strncpy(&buf[0], MIXER_ONBOARD_PATH, sizeof(buf) - 1);
/* enforce null termination */
buf[sizeof(buf) - 1] = '\0';
(void)strncpy(&buf[strlen(MIXER_ONBOARD_PATH)], "/", 1); (void)strncpy(&buf[strlen(MIXER_ONBOARD_PATH)], "/", 1);
(void)strncpy(&buf[strlen(MIXER_ONBOARD_PATH) + 1], result->d_name, sizeof(buf) - strlen(MIXER_ONBOARD_PATH) - 1); (void)strncpy(&buf[strlen(MIXER_ONBOARD_PATH) + 1], result->d_name, sizeof(buf) - strlen(MIXER_ONBOARD_PATH) - 1);
@@ -597,7 +599,7 @@ mixer_callback(uintptr_t handle, uint8_t control_group, uint8_t control_index, f
return -1; return -1;
} }
if (control_index > (sizeof(actuator_controls) / sizeof(actuator_controls[0]))) { if (control_index >= (sizeof(actuator_controls) / sizeof(actuator_controls[0]))) {
return -1; return -1;
} }