webadmin/pico-keys-sdk
1
0
Fork 0
mirror of https://github.com/polhenarejos/pico-keys-sdk synced 2026-05-28 17:11:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

If file functions are called with NULL arg silently return.

Browse Source 
Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
This commit is contained in:
Pol Henarejos
2022-12-24 01:39:26 +01:00
parent a8fe504d14
commit 36b2924036
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/fs/file.c
View File

@@ -284,6 +284,8 @@ file_t *search_dynamic_file(uint16_t fid) {
} }
int delete_dynamic_file(file_t *f) { int delete_dynamic_file(file_t *f) {
if (f == NULL)
return NULL;
for (int i = 0; i < dynamic_files; i++) { for (int i = 0; i < dynamic_files; i++) {
if (dynamic_file[i].fid == f->fid) { if (dynamic_file[i].fid == f->fid) {
for (int j = i+1; j < dynamic_files; j++) for (int j = i+1; j < dynamic_files; j++)
@@ -439,6 +441,8 @@ bool file_has_data(file_t *f) {
} }
int delete_file(file_t *ef) { int delete_file(file_t *ef) {
if (ef == NULL)
return CCID_OK;
meta_delete(ef->fid); meta_delete(ef->fid);
if (flash_clear_file(ef) != CCID_OK) if (flash_clear_file(ef) != CCID_OK)
return CCID_EXEC_ERROR; return CCID_EXEC_ERROR;

2
src/fs/flash.c
View File

@@ -95,6 +95,8 @@ uintptr_t allocate_free_addr(uint16_t size, bool persistent) {
} }
int flash_clear_file(file_t *file) { int flash_clear_file(file_t *file) {
if (file == NULL)
return CCID_OK;
uintptr_t base_addr = (uintptr_t)(file->data-sizeof(uintptr_t)-sizeof(uint16_t)-sizeof(uintptr_t)); uintptr_t base_addr = (uintptr_t)(file->data-sizeof(uintptr_t)-sizeof(uint16_t)-sizeof(uintptr_t));
uintptr_t prev_addr = flash_read_uintptr(base_addr+sizeof(uintptr_t)); uintptr_t prev_addr = flash_read_uintptr(base_addr+sizeof(uintptr_t));
uintptr_t next_addr = flash_read_uintptr(base_addr); uintptr_t next_addr = flash_read_uintptr(base_addr);