Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Terrain: fix snprintf-overflow compilation error 

[451/678] Compiling libraries/AP_Terrain/TerrainIO.cpp
../../libraries/AP_Terrain/TerrainIO.cpp: In member function ‘void AP_Terrain::open_file()’:
../../libraries/AP_Terrain/TerrainIO.cpp:167:35: error: ‘.DAT’ directive output may be truncated writing 4 bytes into a region of size between 2 and 5 [-Werror=format-truncation=]
  167 |     snprintf(p, 13, "/%c%02u%c%03u.DAT",
      |                                   ^~~~
compilation terminated due to -Wfatal-errors.
This commit is contained in:
Peter Barker 2020-07-31 10:48:09 +10:00 committed by Peter Barker
parent 4527321035
commit 5c4c7b5fd4
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libraries/AP_Terrain/TerrainIO.cpp
View File

@ -164,11 +164,22 @@ void AP_Terrain::open_file(void)
io_failure = true;
return;
}
// our fancy templatified MIN macro get gcc 9.3.0 all confused; it
// thinks there are more digits than there can be so says there's
// a buffer overflow in the snprintf. Constrain it long-form:
uint32_t lat_tmp = abs((int32_t)block.lat_degrees);
if (lat_tmp > 99U) {
lat_tmp = 99U;
}
uint32_t lon_tmp = abs((int32_t)block.lon_degrees);
if (lon_tmp > 999U) {
lon_tmp = 999;
}
snprintf(p, 13, "/%c%02u%c%03u.DAT",
block.lat_degrees<0?'S':'N',
(unsigned)MIN(abs((int32_t)block.lat_degrees), 99),
(unsigned)lat_tmp,
block.lon_degrees<0?'W':'E',
(unsigned)MIN(abs((int32_t)block.lon_degrees), 999));
(unsigned)lon_tmp);
// create directory if need be
if (!directory_created) {