aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

AP_OSD: account for snprintf now null-terminating strings

Browse Source
This commit is contained in:
Peter Barker 2018-09-06 12:16:41 +10:00 committed by Andrew Tridgell
parent 33e3d6e254
commit de3244e26c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_OSD/AP_OSD_Backend.cpp
View File

@ -28,7 +28,7 @@ void AP_OSD_Backend::write(uint8_t x, uint8_t y, bool blink, const char *fmt, ..
if (blink && (blink_phase < 2)) { if (blink && (blink_phase < 2)) {
return; return;
} }
char buff[32]; char buff[32+1]; // +1 for snprintf null-termination
va_list ap; va_list ap;
va_start(ap, fmt); va_start(ap, fmt);
int res = hal.util->vsnprintf(buff, sizeof(buff), fmt, ap); int res = hal.util->vsnprintf(buff, sizeof(buff), fmt, ap);
@ -43,7 +43,7 @@ void AP_OSD_Backend::write(uint8_t x, uint8_t y, bool blink, const char *fmt, ..
res--; res--;
} }
} }
if (res < int(sizeof(buff))) { if (res < int(sizeof(buff))-1) {
write(x, y, buff); write(x, y, buff);
} }
va_end(ap); va_end(ap);