Skip to content

[lib][fs] Fix cleanup on handle allocation failure #503

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bl4ckhyun wants to merge 2 commits into from
Closed

[lib][fs] Fix cleanup on handle allocation failure #503

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9ac258
[lib][libc] Fix fclose condition for fs-backed streams
bl4ckhyun Apr 13, 2026
4375e93
[lib][fs] Fix cleanup on handle allocation failure
bl4ckhyun Apr 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion lib/fs/fs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,11 @@ status_t fs_open_file(const char *path, filehandle **handle) {
}

filehandle *f = malloc(sizeof(*f));
if (!f) {
mount->api->close(cookie);
put_mount(mount);
return ERR_NO_MEMORY;
}
f->cookie = cookie;
f->mount = mount;
*handle = f;
Expand Down Expand Up @@ -309,8 +314,9 @@ status_t fs_create_file(const char *path, filehandle **handle, uint64_t len) {

filehandle *f = malloc(sizeof(*f));
if (!f) {
mount->api->close(cookie);
put_mount(mount);
return err;
return ERR_NO_MEMORY;
}
f->cookie = cookie;
f->mount = mount;
Expand Down Expand Up @@ -425,6 +431,7 @@ status_t fs_open_dir(const char *path, dirhandle **handle) {

dirhandle *d = malloc(sizeof(*d));
if (!d) {
mount->api->closedir(cookie);
put_mount(mount);
return ERR_NO_MEMORY;
}
Expand Down
2 changes: 1 addition & 1 deletion lib/libc/stdio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ FILE *fopen(const char *filename, const char *mode) {

int fclose(FILE *stream) {
#if defined(WITH_LIB_FS)
if (stream && !stream->use_fs) {
if (stream && stream->use_fs) {
fs_close_file(stream->fs_handle.handle);
free(stream);
}
Expand Down