Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-05 07:28:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Terrain: prevent use of invalid Location

Browse Source 
loc is not initialised and can cause a fault on startup
This commit is contained in:
Andrew Tridgell 2016-12-22 15:46:26 +11:00
parent b845668f23
commit bbccdce229
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/AP_Terrain/AP_Terrain.cpp
View File

@ -316,7 +316,7 @@ void AP_Terrain::update(void)
// update the cached current location height // update the cached current location height
Location loc; Location loc;
bool pos_valid = ahrs.get_position(loc); bool pos_valid = ahrs.get_position(loc);
bool terrain_valid = height_amsl(loc, height, false); bool terrain_valid = pos_valid && height_amsl(loc, height, false);
if (pos_valid && terrain_valid) { if (pos_valid && terrain_valid) {
last_current_loc_height = height; last_current_loc_height = height;
have_current_loc_height = true; have_current_loc_height = true;