fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-11-02 07:51:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

mavlink:Use CONFIG_BOARD_ROOT_PATH instead of string constant

Browse Source
This commit is contained in:
David Sidrane
2024-07-24 11:39:44 -04:00
committed by Daniel Agar
parent ea92c7ffcc
commit 54b20f1ff3
2 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
+1 -1
View File
@@ -1160,7 +1160,7 @@ bool MavlinkFTP::_validatePathIsWritable(const char *path)
// Don't allow writes to system paths as they are in RAM // Don't allow writes to system paths as they are in RAM
// Ideally we'd canonicalize the path (with 'realpath'), but it might not exist, so realpath() would fail. // Ideally we'd canonicalize the path (with 'realpath'), but it might not exist, so realpath() would fail.
// The next simpler thing is to check there's no reference to a parent dir. // The next simpler thing is to check there's no reference to a parent dir.
if (strncmp(path, "/fs/microsd/", 12) != 0 || strstr(path, "/../") != nullptr) { if (strncmp(path, CONFIG_BOARD_ROOT_PATH "/", 12) != 0 || strstr(path, "/../") != nullptr) {
PX4_ERR("Disallowing write to %s", path); PX4_ERR("Disallowing write to %s", path);
return false; return false;
} }
src/modules/mavlink/mavlink_tests/mavlink_ftp_test.cpp
+1 -1
View File
@@ -43,7 +43,7 @@
#include "../mavlink_ftp.h" #include "../mavlink_ftp.h"
#ifdef __PX4_NUTTX #ifdef __PX4_NUTTX
#define PX4_MAVLINK_TEST_DATA_DIR "/fs/microsd/ftp_unit_test_data" #define PX4_MAVLINK_TEST_DATA_DIR CONFIG_BOARD_ROOT_PATH "/ftp_unit_test_data"
#else #else
#define PX4_MAVLINK_TEST_DATA_DIR "ftp_unit_test_data" #define PX4_MAVLINK_TEST_DATA_DIR "ftp_unit_test_data"
#endif #endif