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

GCS_MAVLink: prevent segv in ftp

Browse Source 
if the user disables ftp by changing BRD_OPTIONS after ftp has started
then we could dereference a nullptr
This commit is contained in:
Andrew Tridgell 2022-10-14 07:24:20 +11:00 committed by Randy Mackay
parent 781fed2390
commit 19d444bb3a
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/GCS_MAVLink/GCS_FTP.cpp
View File

@ -181,7 +181,7 @@ void GCS_MAVLINK::ftp_worker(void) {
while (true) { while (true) {
bool skip_push_reply = false; bool skip_push_reply = false;
while (!ftp.requests->pop(request)) { while (ftp.requests == nullptr || !ftp.requests->pop(request)) {
// nothing to handle, delay ourselves a bit then check again. Ideally we'd use conditional waits here // nothing to handle, delay ourselves a bit then check again. Ideally we'd use conditional waits here
hal.scheduler->delay(2); hal.scheduler->delay(2);
} }