Skip to content

gh-67413: Fix segfaults and multiple leaks in the lzma and bz2 modules #7822

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

Merged
miss-islington merged 4 commits into from
Feb 23, 2023
Merged

gh-67413: Fix segfaults and multiple leaks in the lzma and bz2 modules #7822

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5152303
bpo-23224: Fix segfaults and multiple leaks in the lzma and bz2 modules
ZackerySpytz Jun 20, 2018
1b4c17e
Merge branch 'master' into bpo-23224-lzma-bz2-segfault
ZackerySpytz Jun 23, 2018
66dc4eb
Merge remote-tracking branch 'upstream/master' into bpo-23224-lzma-bz…
ZackerySpytz May 19, 2019
c9f1273
Pull in main and add clinic state access
erlend-aasland Feb 22, 2023
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
Prev Previous commit
Next Next commit
Merge branch 'master' into bpo-23224-lzma-bz2-segfault
  • Loading branch information
@ZackerySpytz
ZackerySpytz authored Jun 23, 2018
commit 1b4c17e9d0a4f00f45dbba23796f7f9c3440e178
4 changes: 0 additions & 4 deletions Modules/_bz2module.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,10 +656,6 @@ _bz2_BZ2Decompressor_impl(PyTypeObject *type)
PyErr_SetString(PyExc_MemoryError, "Unable to allocate lock");
return NULL;
}
if (self->lock != NULL) {
PyThread_free_lock(self->lock);
}
self->lock = lock;

self->needs_input = 1;
self->bzs_avail_in_real = 0;
Expand Down
4 changes: 0 additions & 4 deletions Modules/_lzmamodule.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,10 +1192,6 @@ _lzma_LZMADecompressor_impl(PyTypeObject *type, int format,
PyErr_SetString(PyExc_MemoryError, "Unable to allocate lock");
return NULL;
}
if (self->lock != NULL) {
PyThread_free_lock(self->lock);
}
self->lock = lock;

self->check = LZMA_CHECK_UNKNOWN;
self->needs_input = 1;
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.