Skip to content
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

Jump to bottom

Handle read errors in alloc_cluster() to avoid "infinite" loop #16

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Handle read errors in alloc_cluster() to avoid "infinite" loop #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 8 additions & 2 deletions ufat.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,15 +642,21 @@ static int alloc_cluster(struct ufat *uf, ufat_cluster_t *out,
for (i = 0; i < total; i++) {
const ufat_cluster_t idx = uf->alloc_ptr + 2;
ufat_cluster_t c;
int err;

uf->alloc_ptr = (uf->alloc_ptr + 1) % total;

/* Never use this cluster index in a FAT12 system */
if (idx == 0xff0 && uf->bpb.type == UFAT_TYPE_FAT12)
continue;

if (!ufat_read_fat(uf, idx, &c) && c == UFAT_CLUSTER_FREE) {
int err = ufat_write_fat(uf, idx, tail);
err = ufat_read_fat(uf, idx, &c);

if (err < 0)
return err;

if (c == UFAT_CLUSTER_FREE) {
err = ufat_write_fat(uf, idx, tail);

if (err < 0)
return err;
Expand Down