djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent folder from trying to move inside itself

This commit is contained in:
Melissa LeBlanc-Williams 2022-09-09 15:11:35 -07:00
parent 45ee13086a
commit e9b9cac232
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
supervisor/shared/web_workflow/web_workflow.c
View File

@ -1080,7 +1080,19 @@ static bool _reply(socketpool_socket_obj_t *socket, _request *request) {
destination[destinationlen - 1] = '\0';
}
FRESULT result = f_rename(fs, path, destination);
// Check to see if we're moving a directory into itself.
FILINFO file;
FRESULT result = f_stat(fs, path, &file);
if (result == FR_OK) {
if ((file.fattrib & AM_DIR) != 0 &&
strlen(destination) > strlen(path) &&
destination[strlen(path)] == '/' &&
strncmp(path, destination, strlen(path)) == 0) {
result = FR_NO_PATH;
} else {
result = f_rename(fs, path, destination);
}
}
#if CIRCUITPY_USB_MSC
usb_msc_unlock();
#endif