fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-03 05:21:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Mixer test: Fix string termination corner case

Browse Source
This commit is contained in:
Lorenz Meier
2017-01-14 07:47:03 -08:00
parent 9605507c87
commit 6927fcb5c0
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
@@ -297,10 +297,10 @@ bool MixerTest::load_mixer(const char *filename, const char *buf, unsigned loade
ut_compare("empty buffer load", empty_load, 0); ut_compare("empty buffer load", empty_load, 0);
/* FIRST mark the mixer as invalid */ /* reset, load in chunks */
/* THEN actually delete it */
mixer_group.reset(); mixer_group.reset();
char mixer_text[PX4IO_MAX_MIXER_LENGHT]; /* large enough for one mixer */ char mixer_text[PX4IO_MAX_MIXER_LENGHT]; /* large enough for one mixer */
unsigned mixer_text_length = 0; unsigned mixer_text_length = 0;
unsigned transmitted = 0; unsigned transmitted = 0;
@@ -333,6 +333,8 @@ bool MixerTest::load_mixer(const char *filename, const char *buf, unsigned loade
/* copy any leftover text to the base of the buffer for re-use */ /* copy any leftover text to the base of the buffer for re-use */
if (resid > 0) { if (resid > 0) {
memcpy(&mixer_text[0], &mixer_text[mixer_text_length - resid], resid); memcpy(&mixer_text[0], &mixer_text[mixer_text_length - resid], resid);
/* enforce null termination */
mixer_text[resid] = '\0';
} }
mixer_text_length = resid; mixer_text_length = resid;