Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[3.11] gh-104282: Fix null pointer dereference in lzma._decode_filter_properties (GH-104283) #114182

Merged
merged 1 commit into from
Jan 17, 2024
Merged

[3.11] gh-104282: Fix null pointer dereference in lzma._decode_filter_properties (GH-104283) #114182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Lib/test/test_lzma.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1409,6 +1409,14 @@ def test__decode_filter_properties(self):
self.assertEqual(filterspec["lc"], 3)
self.assertEqual(filterspec["dict_size"], 8 << 20)

# see gh-104282
filters = [lzma.FILTER_X86, lzma.FILTER_POWERPC,
lzma.FILTER_IA64, lzma.FILTER_ARM,
lzma.FILTER_ARMTHUMB, lzma.FILTER_SPARC]
for f in filters:
filterspec = lzma._decode_filter_properties(f, b"")
self.assertEqual(filterspec, {"id": f})

def test_filter_properties_roundtrip(self):
spec1 = lzma._decode_filter_properties(
lzma.FILTER_LZMA1, b"]\x00\x00\x80\x00")
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2023-05-08-09-30-00.gh-issue-104282.h4c6Eb.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix null pointer dereference in :func:`lzma._decode_filter_properties`
due to improper handling of BCJ filters with properties of zero length.
Patch by Radislav Chugunov.
4 changes: 3 additions & 1 deletion Modules/_lzmamodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,9 @@ build_filter_spec(const lzma_filter *f)
case LZMA_FILTER_ARMTHUMB:
case LZMA_FILTER_SPARC: {
lzma_options_bcj *options = f->options;
ADD_FIELD(options, start_offset);
if (options) {
ADD_FIELD(options, start_offset);
}
break;
}
default:
Expand Down
Loading