Skip to content

fix nullptr access in lfs_dir_fetchmatch (#185) #337

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

Merged
merged 2 commits into from
Dec 1, 2019
Merged

fix nullptr access in lfs_dir_fetchmatch (#185) #337

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64dedee
prepare upstream bugfix of lfs
May 17, 2019
60e67ae
Fixed implicit change-of-sign warning in lfs_dir_fetch
geky Nov 26, 2019
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
6 changes: 3 additions & 3 deletions lfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -975,9 +975,10 @@ static lfs_stag_t lfs_dir_fetchmatch(lfs_t *lfs,

static int lfs_dir_fetch(lfs_t *lfs,
lfs_mdir_t *dir, const lfs_block_t pair[2]) {
// note, mask=-1, tag=0 can never match a tag since this
// note, mask=-1, tag=-1 can never match a tag since this
// pattern has the invalid bit set
return (int)lfs_dir_fetchmatch(lfs, dir, pair, -1, 0, NULL, NULL, NULL);
return (int)lfs_dir_fetchmatch(lfs, dir, pair,
(lfs_tag_t)-1, (lfs_tag_t)-1, NULL, NULL, NULL);
}

static int lfs_dir_getgstate(lfs_t *lfs, const lfs_mdir_t *dir,
Expand Down Expand Up @@ -1643,7 +1644,6 @@ static int lfs_dir_compact(lfs_t *lfs,
if (err && (err != LFS_ERR_NOSPC && !exhausted)) {
return err;
}

continue;
}

Expand Down