Fcalva/gint
1
0
Fork 0
mirror of https://git.planet-casio.com/Lephenixnoir/gint.git synced 2024-12-28 04:23:36 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fs: fix incorrect OoM handling in fugue_dir_explore()

Browse source 
Non-NULL dp would be returned by alloc failure path despite having been
freed.
This commit is contained in:
Lephe 2024-02-04 18:17:41 +01:00
parent caa68b08bf
commit 1e220af616
No known key found for this signature in database
GPG key ID: 1BBA026E13FC0495
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/fs/fugue/fugue_dir.c
View file

@ -93,6 +93,8 @@ void *fugue_dir_explore(char const *path)
struct BFile_FileInfo info; struct BFile_FileInfo info;
char *wildcard=NULL; char *wildcard=NULL;
uint16_t *fc_path=NULL, *search=NULL; uint16_t *fc_path=NULL, *search=NULL;
/* We allocate by batches of 8 */
int sd=-1, rc, allocated=0;
dir_t *dp = malloc(sizeof *dp); dir_t *dp = malloc(sizeof *dp);
if(!dp) goto alloc_failure; if(!dp) goto alloc_failure;
@ -100,8 +102,6 @@ void *fugue_dir_explore(char const *path)
dp->count = 0; dp->count = 0;
dp->entries = NULL; dp->entries = NULL;
dp->pos = 0; dp->pos = 0;
/* We allocate by batches of 8 */
int sd=-1, rc, allocated=0;
fc_path = malloc(512 * sizeof *fc_path); fc_path = malloc(512 * sizeof *fc_path);
if(!fc_path) goto alloc_failure; if(!fc_path) goto alloc_failure;
@ -149,6 +149,7 @@ void *fugue_dir_explore(char const *path)
alloc_failure: alloc_failure:
errno = ENOMEM; errno = ENOMEM;
fugue_dir_close(dp); fugue_dir_close(dp);
dp = NULL;
end: end:
free(wildcard); free(wildcard);
free(search); free(search);