fix

youknowone · youknowone · commit faed28bc4429 · 2026-02-27T13:39:10.000+09:00
diff --git a/crates/stdlib/src/lzma.rs b/crates/stdlib/src/lzma.rs
@@ -385,14 +385,13 @@ mod _lzma {
         Ok(filters)
     }
 
-    // lzma_encoder_presets.c
-    const DEFAULT_LC: u32 = 3;
-    const DEFAULT_LP: u32 = 0;
-    const DEFAULT_PB: u32 = 2;
+    const DEFAULT_LC: u32 = liblzma_sys::LZMA_LC_DEFAULT;
+    const DEFAULT_LP: u32 = liblzma_sys::LZMA_LP_DEFAULT;
+    const DEFAULT_PB: u32 = liblzma_sys::LZMA_PB_DEFAULT;
     const DICT_POW2: [u8; 10] = [18, 20, 21, 22, 22, 23, 23, 24, 25, 26];
 
     fn preset_dict_size(preset: u32) -> u32 {
-        let level = (preset & 0x1F) as usize;
+        let level = (preset & liblzma_sys::LZMA_PRESET_LEVEL_MASK) as usize;
         if level > 9 {
             return 0;
         }
@@ -460,24 +459,28 @@ mod _lzma {
                 dict.set_item("dict_size", vm.new_pyobj(dict_size), vm)?;
             }
             FILTER_LZMA2 => {
-                if props.is_empty() {
+                if props.len() != 1 {
                     return Err(new_lzma_error("Invalid or unsupported options", vm));
                 }
                 let dict_size = lzma2_dict_size_from_prop(props[0]);
                 dict.set_item("dict_size", vm.new_pyobj(dict_size), vm)?;
             }
             FILTER_DELTA => {
-                if props.is_empty() {
+                if props.len() != 1 {
                     return Err(new_lzma_error("Invalid or unsupported options", vm));
                 }
                 let dist = props[0] as u32 + 1;
                 dict.set_item("dist", vm.new_pyobj(dist), vm)?;
             }
             FILTER_X86 | FILTER_POWERPC | FILTER_IA64 | FILTER_ARM | FILTER_ARMTHUMB
             | FILTER_SPARC => {
-                if props.len() == 4 {
+                if props.is_empty() {
+                    // default: no start_offset
+                } else if props.len() == 4 {
                     let start_offset = u32::from_le_bytes([props[0], props[1], props[2], props[3]]);
                     dict.set_item("start_offset", vm.new_pyobj(start_offset), vm)?;
+                } else {
+                    return Err(new_lzma_error("Invalid or unsupported options", vm));
                 }
             }
             _ => {

Original file line number	Diff line number	Diff line change
`@@ -385,14 +385,13 @@ mod _lzma {`
`385`	`385`	`Ok(filters)`
`386`	`386`	`}`
`387`	`387`
`388`		`- // lzma_encoder_presets.c`
`389`		`- const DEFAULT_LC: u32 = 3;`
`390`		`- const DEFAULT_LP: u32 = 0;`
`391`		`- const DEFAULT_PB: u32 = 2;`
	`388`	`+ const DEFAULT_LC: u32 = liblzma_sys::LZMA_LC_DEFAULT;`
	`389`	`+ const DEFAULT_LP: u32 = liblzma_sys::LZMA_LP_DEFAULT;`
	`390`	`+ const DEFAULT_PB: u32 = liblzma_sys::LZMA_PB_DEFAULT;`
`392`	`391`	`const DICT_POW2: [u8; 10] = [18, 20, 21, 22, 22, 23, 23, 24, 25, 26];`
`393`	`392`
`394`	`393`	`fn preset_dict_size(preset: u32) -> u32 {`
`395`		`- let level = (preset & 0x1F) as usize;`
	`394`	`+ let level = (preset & liblzma_sys::LZMA_PRESET_LEVEL_MASK) as usize;`
`396`	`395`	`if level > 9 {`
`397`	`396`	`return 0;`
`398`	`397`	`}`
`@@ -460,24 +459,28 @@ mod _lzma {`
`460`	`459`	`dict.set_item("dict_size", vm.new_pyobj(dict_size), vm)?;`
`461`	`460`	`}`
`462`	`461`	`FILTER_LZMA2 => {`
`463`		`- if props.is_empty() {`
	`462`	`+ if props.len() != 1 {`
`464`	`463`	`return Err(new_lzma_error("Invalid or unsupported options", vm));`
`465`	`464`	`}`
`466`	`465`	`let dict_size = lzma2_dict_size_from_prop(props[0]);`
`467`	`466`	`dict.set_item("dict_size", vm.new_pyobj(dict_size), vm)?;`
`468`	`467`	`}`
`469`	`468`	`FILTER_DELTA => {`
`470`		`- if props.is_empty() {`
	`469`	`+ if props.len() != 1 {`
`471`	`470`	`return Err(new_lzma_error("Invalid or unsupported options", vm));`
`472`	`471`	`}`
`473`	`472`	`let dist = props[0] as u32 + 1;`
`474`	`473`	`dict.set_item("dist", vm.new_pyobj(dist), vm)?;`
`475`	`474`	`}`
`476`	`475`	`FILTER_X86 \| FILTER_POWERPC \| FILTER_IA64 \| FILTER_ARM \| FILTER_ARMTHUMB`
`477`	`476`	`\| FILTER_SPARC => {`
`478`		`- if props.len() == 4 {`
	`477`	`+ if props.is_empty() {`
	`478`	`+ // default: no start_offset`
	`479`	`+ } else if props.len() == 4 {`
`479`	`480`	`let start_offset = u32::from_le_bytes([props[0], props[1], props[2], props[3]]);`
`480`	`481`	`dict.set_item("start_offset", vm.new_pyobj(start_offset), vm)?;`
	`482`	`+ } else {`
	`483`	`+ return Err(new_lzma_error("Invalid or unsupported options", vm));`
`481`	`484`	`}`
`482`	`485`	`}`
`483`	`486`	`_ => {`