Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

mavlink: added read size limits on FTP read

Browse Source 
thanks to Michael Oborne for spotting this:

https://github.com/ArduPilot/MissionPlanner/issues/2784
This commit is contained in:
Andrew Tridgell 2022-02-08 07:44:34 +11:00
parent b45680c9ee
commit a32ecfbf29
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/GCS_MAVLink/GCS_FTP.cpp
View File

@ -323,7 +323,7 @@ void GCS_MAVLINK::ftp_worker(void) {
}
// fill the buffer
const ssize_t read_bytes = AP::FS().read(ftp.fd, reply.data, request.size);
const ssize_t read_bytes = AP::FS().read(ftp.fd, reply.data, MIN(sizeof(reply.data),request.size));
if (read_bytes == -1) {
ftp_error(reply, FTP_ERROR::FailErrno);
break;
@ -508,7 +508,7 @@ void GCS_MAVLINK::ftp_worker(void) {
const uint32_t transfer_size = 100;
for (uint32_t i = 0; (i < transfer_size); i++) {
// fill the buffer
const ssize_t read_bytes = AP::FS().read(ftp.fd, reply.data, max_read);
const ssize_t read_bytes = AP::FS().read(ftp.fd, reply.data, MIN(sizeof(reply.data), max_read));
if (read_bytes == -1) {
ftp_error(reply, FTP_ERROR::FailErrno);
break;