hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tools/squashfs4: fix bugs of xz compress options 

lzma_xz_dump_options never return NULL,
should compare real options with default options

Signed-off-by: Liangbin Lian <jjm2473@gmail.com>
openwrt-18.06
Liangbin Lian 2020-08-19 23:44:48 +08:00 committed by Hauke Mehrtens
parent e6bcfdfdba
commit 910ac641cc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/squashfs4/patches/160-expose_lzma_xz_options.patch
View File

@ -370,9 +370,9 @@
+ if (options.preset == 6 && + if (options.preset == 6 &&
+ options.extreme == 0 && + options.extreme == 0 &&
+ options.lc == LZMA_OPT_LC_DEFAULT && + options.lc == LZMA_OPT_LC_DEFAULT &&
+ options.lp == LZMA_OPT_LC_DEFAULT && + options.lp == LZMA_OPT_LP_DEFAULT &&
+ options.pb == LZMA_OPT_PB_DEFAULT && + options.pb == LZMA_OPT_PB_DEFAULT &&
+ options.fb == 0 && + options.fb == LZMA_OPT_FB_DEFAULT &&
+ options.dict_size == block_size && + options.dict_size == block_size &&
+ flags == 0) + flags == 0)
+ return NULL; + return NULL;
@ -405,7 +405,7 @@
+ options.preset = 6; + options.preset = 6;
+ options.extreme = 0; + options.extreme = 0;
+ options.lc = LZMA_OPT_LC_DEFAULT; + options.lc = LZMA_OPT_LC_DEFAULT;
+ options.lp = LZMA_OPT_LC_DEFAULT; + options.lp = LZMA_OPT_LP_DEFAULT;
+ options.pb = LZMA_OPT_PB_DEFAULT; + options.pb = LZMA_OPT_PB_DEFAULT;
+ options.fb = LZMA_OPT_FB_DEFAULT; + options.fb = LZMA_OPT_FB_DEFAULT;
+ options.dict_size = block_size; + options.dict_size = block_size;