Commit0154405

authored

gh-104282: Fix null pointer dereference inlzma._decode_filter_properties (GH-104283)

1 parentb204c4b commit0154405Copy full SHA for 0154405

File tree

+14

-1

lines changed

+14

-1

lines changed

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1401,6 +1401,14 @@ def test__decode_filter_properties(self):`
`1401`	`1401`	`self.assertEqual(filterspec["lc"],3)`
`1402`	`1402`	`self.assertEqual(filterspec["dict_size"],8<<20)`
`1403`	`1403`
	`1404`	`+# see gh-104282`
	`1405`	`+filters= [lzma.FILTER_X86,lzma.FILTER_POWERPC,`
	`1406`	`+lzma.FILTER_IA64,lzma.FILTER_ARM,`
	`1407`	`+lzma.FILTER_ARMTHUMB,lzma.FILTER_SPARC]`
	`1408`	`+forfinfilters:`
	`1409`	`+filterspec=lzma._decode_filter_properties(f,b"")`
	`1410`	`+self.assertEqual(filterspec, {"id":f})`
	`1411`	`+`
`1404`	`1412`	`deftest_filter_properties_roundtrip(self):`
`1405`	`1413`	`spec1=lzma._decode_filter_properties(`
`1406`	`1414`	`lzma.FILTER_LZMA1,b"]\x00\x00\x80\x00")`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+Fix null pointer dereference in:func:`lzma._decode_filter_properties`
	`2`	`+due to improper handling of BCJ filters with properties of zero length.`
	`3`	`+Patch by Radislav Chugunov.`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -492,7 +492,9 @@ build_filter_spec(const lzma_filter *f)`
`492`	`492`	`caseLZMA_FILTER_ARMTHUMB:`
`493`	`493`	`caseLZMA_FILTER_SPARC: {`
`494`	`494`	`lzma_options_bcj*options=f->options;`
`495`		`-ADD_FIELD(options,start_offset);`
	`495`	`+if (options) {`
	`496`	`+ADD_FIELD(options,start_offset);`
	`497`	`+ }`
`496`	`498`	`break;`
`497`	`499`	`}`
`498`	`500`	`default:`

Comments

(0)