8000 bpo-30061: Check if PyObject_Size()/PySequence_Size()/PyMapping_Size() by serhiy-storchaka · Pull Request #1096 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-30061: Check if PyObject_Size()/PySequence_Size()/PyMapping_Size() #1096

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
merged 7 commits into from
Apr 19, 2017
Merged

bpo-30061: Check if PyObject_Size()/PySequence_Size()/PyMapping_Size() #1096

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8317163
bpo-30061: Check if PyObject_Size()/PySequence_Size()/PyMapping_Size(…
serhiy-storchaka Apr 12, 2017
68b90d8
Address Xiang's comments.
serhiy-storchaka Apr 14, 2017
80e16a2
Add additional test.
serhiy-storchaka Apr 14, 2017
5b6e6ba
Merge branch 'master' into PyObject_Size-check-error
serhiy-storchaka Apr 16, 2017
e459aa6
Fix a leak in iobase.c.
serhiy-storchaka Apr 16, 2017
25cc5b5
Add a Misc/NEWS entry and optimize set checks.
serhiy-storchaka Apr 19, 2017
6908bd9
Fixed a syntax error.
serhiy-storchaka Apr 19, 2017
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
Add a Misc/NEWS entry and optimize set checks.
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Apr 19, 2017
commit 25cc5b5cc529d48abf8682186d4ffe39d82c1213
5 changes: 5 additions & 0 deletions Misc/NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,11 @@ Extension Modules
Library
-------

- bpo-30061: Fixed crashes in IOBase methods __next__() and readlines() when
readline() or __next__() respectively return non-sizeable object.
Fixed possible other errors caused by not checking results of PyObject_Size(),
PySequence_Size(), or PyMapping_Size().

- bpo-10076: Compiled regular expression and match objects in the re module
now support copy.copy() and copy.deepcopy() (they are considered atomic).

Expand Down
10 changes: 7 additions & 3 deletions Objects/setobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1553,14 +1553,18 @@ set_difference(PySetObject *so, PyObject *other)
return set_copy(so);
}

if (!PyAnySet_Check(other) && !PyDict_CheckExact(other)) {
if (PyAnySet_Check(other) {
other_size = PySet_GET_SIZE(other);
}
else if (PyDict_CheckExact(other)) {
other_size = PyDict_GET_SIZE(other);
}
else {
return set_copy_and_difference(so, other);
}

/* If len(so) much more than len(other), it's more efficient to simply copy
* so and then iterate other looking for common elements. */
other_size = PyDict_CheckExact(other) ? PyDict_GET_SIZE(other)
: PySet_GET_SIZE(other);
if ((PySet_GET_SIZE(so) >> 2) > other_size) {
return set_copy_and_difference(so, other);
}
Expand Down
0