diff options
author | Tom Rini <trini@konsulko.com> | 2020-12-03 17:43:47 +0300 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2020-12-03 17:43:47 +0300 |
commit | ee1e04558ff8c8ed812b986939447f129bb0b0bb (patch) | |
tree | 3a8e867ec03a87263834725b5815c43465a81f88 /fs | |
parent | ab31883ae7e54ded8396b13a9057f861bf916ea4 (diff) | |
parent | a6cd384b9c37596ca9035f26922dd65991ddcb85 (diff) | |
download | u-boot-ee1e04558ff8c8ed812b986939447f129bb0b0bb.tar.xz |
Merge branch '2020-12-02-master-imports'
- Assorted minor fixes
Diffstat (limited to 'fs')
-rw-r--r-- | fs/squashfs/sqfs.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/squashfs/sqfs.c b/fs/squashfs/sqfs.c index 608a2bb454..5de69ac3ca 100644 --- a/fs/squashfs/sqfs.c +++ b/fs/squashfs/sqfs.c @@ -49,6 +49,7 @@ static int sqfs_read_sblk(struct squashfs_super_block **sblk) if (sqfs_disk_read(0, 1, *sblk) != 1) { free(*sblk); + sblk = NULL; return -EINVAL; } @@ -1689,9 +1690,10 @@ free_strings: void sqfs_close(void) { + sqfs_decompressor_cleanup(&ctxt); free(ctxt.sblk); + ctxt.sblk = NULL; ctxt.cur_dev = NULL; - sqfs_decompressor_cleanup(&ctxt); } void sqfs_closedir(struct fs_dir_stream *dirs) |