lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-11-02 09:13:20 +03:00
Code Activity

Fix case where pages run out before end of stream

Browse Source
This commit is contained in:
Sean Purcell
2017-04-27 16:54:05 -07:00
parent 32c658a289
commit eeeb201e70
2 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
contrib/linux-kernel/fs/squashfs/zstd_wrapper.c
View File

@@ -101,12 +101,13 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm,
if (out_buf.pos == out_buf.size) {
out_buf.dst = squashfs_next_page(output);
out_buf.pos = 0;
if (out_buf.dst != NULL) {
out_buf.size = PAGE_SIZE;
} else {
out_buf.size = 0;
if (out_buf.dst == NULL) {
/* shouldn't run out of pages before stream is
* done */
goto out;
}
out_buf.pos = 0;
out_buf.size = PAGE_SIZE;
}
total_out -= out_buf.pos;
@@ -127,7 +128,7 @@ static int zstd_uncompress(struct squashfs_sb_info *msblk, void *strm,
if (k < b)
goto out;
return total_out;
return (int)total_out;
out:
for (; k < b; k++)