Mirror/Momentum-Firmware
1
0
Fork 0
mirror of https://github.com/Next-Flip/Momentum-Firmware.git synced 2026-05-13 07:38:35 -07:00
Code Issues Packages Projects Releases Wiki Activity

No copy move to subdir

Browse Source
This commit is contained in:
Willy-JL
2023-05-22 14:09:40 +01:00
parent 8d7932467c
commit 162cecf8af
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
applications/services/storage/storage_external_api.c
View File

@@ -421,7 +421,17 @@ FS_Error storage_common_remove(Storage* storage, const char* path) {
return S_RETURN_ERROR; return S_RETURN_ERROR;
} }
bool storage_is_subdir(const char* a, const char* b) {
char test[strlen(b) + 2];
snprintf(test, sizeof(test), "%s/", b);
return strncmp(a, test, sizeof(test) - 1) == 0;
}
FS_Error storage_common_rename(Storage* storage, const char* old_path, const char* new_path) { FS_Error storage_common_rename(Storage* storage, const char* old_path, const char* new_path) {
if(storage_is_subdir(new_path, old_path)) {
return FSE_INVALID_NAME;
}
S_API_PROLOGUE; S_API_PROLOGUE;
SAData data = { SAData data = {
.rename = { .rename = {
@@ -437,6 +447,10 @@ FS_Error storage_common_rename(Storage* storage, const char* old_path, const cha
static FS_Error static FS_Error
storage_copy_recursive(Storage* storage, const char* old_path, const char* new_path) { storage_copy_recursive(Storage* storage, const char* old_path, const char* new_path) {
if(storage_is_subdir(new_path, old_path)) {
return FSE_INVALID_NAME;
}
FS_Error error = storage_common_mkdir(storage, new_path); FS_Error error = storage_common_mkdir(storage, new_path);
DirWalk* dir_walk = dir_walk_alloc(storage); DirWalk* dir_walk = dir_walk_alloc(storage);
FuriString* path; FuriString* path;