Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-30 04:06:33 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

fix(mavlink): correct session validation in FTP write and burst operations

Browse Source 
Use logical OR (||) instead of AND (&&) in _workWrite() and _workBurst()
session validation, matching the correct logic already used in _workRead()
and _workTerminate(). The AND operator allowed operations to proceed with
an invalid session ID as long as a valid file descriptor existed.

Signed-off-by: Ramon Roche <mrpollo@gmail.com>
This commit is contained in:
Ramon Roche
2026-03-12 19:56:08 -07:00
parent 1009268d31
commit afd327b322
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mavlink/mavlink_ftp.cpp
+2 -2
View File
@@ -566,7 +566,7 @@ MavlinkFTP::_workRead(PayloadHeader *payload)
MavlinkFTP::ErrorCode MavlinkFTP::ErrorCode
MavlinkFTP::_workBurst(PayloadHeader *payload, uint8_t target_system_id, uint8_t target_component_id) MavlinkFTP::_workBurst(PayloadHeader *payload, uint8_t target_system_id, uint8_t target_component_id)
{ {
if (payload->session != 0 && _session_info.fd < 0) { if (payload->session != 0 || _session_info.fd < 0) {
PX4_DEBUG("_workBurst: no session or no fd"); PX4_DEBUG("_workBurst: no session or no fd");
return kErrInvalidSession; return kErrInvalidSession;
} }
@@ -587,7 +587,7 @@ MavlinkFTP::_workBurst(PayloadHeader *payload, uint8_t target_system_id, uint8_t
MavlinkFTP::ErrorCode MavlinkFTP::ErrorCode
MavlinkFTP::_workWrite(PayloadHeader *payload) MavlinkFTP::_workWrite(PayloadHeader *payload)
{ {
if (payload->session != 0 && _session_info.fd < 0) { if (payload->session != 0 || _session_info.fd < 0) {
PX4_DEBUG("_workWrite: no session or no fd"); PX4_DEBUG("_workWrite: no session or no fd");
return kErrInvalidSession; return kErrInvalidSession;
} }