Visitar URL original
[3.11] gh-106030: Miscellaneous fixes in Python/suggestions.c (GH-106… by serhiy-storchaka · Pull Request #106039 · python/cpython · GitHub
Skip to content

[3.11] gh-106030: Miscellaneous fixes in Python/suggestions.c (GH-106… #106039

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
serhiy-storchaka merged 1 commit into from
Jun 23, 2023
Merged

[3.11] gh-106030: Miscellaneous fixes in Python/suggestions.c (GH-106… #106039

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
[3.11] gh-106030: Miscellaneous fixes in Python/suggestions.c (GH-106031 
)

* PyUnicode_CompareWithASCIIString() only works if the second argument
  is ASCII string.
* Refleak in get_suggestions_for_name_error.
* Add some missing error checks..
(cherry picked from commit c8c162e)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
  • Loading branch information
@serhiy-storchaka
serhiy-storchaka committed Jun 23, 2023
commit f8ca034a5d445631b6e91a377ae275151ec01158
12 changes: 6 additions & 6 deletions Python/suggestions.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,14 +147,14 @@ calculate_suggestions(PyObject *dir,

for (int i = 0; i < dir_size; ++i) {
PyObject *item = PyList_GET_ITEM(dir, i);
if (_PyUnicode_Equal(name, item)) {
continue;
}
Py_ssize_t item_size;
const char *item_str = PyUnicode_AsUTF8AndSize(item, &item_size);
if (item_str == NULL) {
return NULL;
}
if (PyUnicode_CompareWithASCIIString(name, item_str) == 0) {
continue;
}
// No more than 1/3 of the involved characters should need changed.
Py_ssize_t max_distance = (name_size + item_size + 3) * MOVE_COST / 6;
// Don't take matches we've already beaten.
Expand Down Expand Up @@ -225,19 +225,19 @@ offer_suggestions_for_name_error(PyNameErrorObject *exc)
PyCodeObject *code = PyFrame_GetCode(frame);
assert(code != NULL && code->co_localsplusnames != NULL);
PyObject *varnames = _PyCode_GetVarnames(code);
Py_DECREF(code);
if (varnames == NULL) {
return NULL;
}
PyObject *dir = PySequence_List(varnames);
Py_DECREF(varnames);
Py_DECREF(code);
if (dir == NULL) {
return NULL;
}

PyObject *suggestions = calculate_suggestions(dir, name);
Py_DECREF(dir);
if (suggestions != NULL) {
if (suggestions != NULL|| PyErr_Occurred()) {
return suggestions;
}

Expand All @@ -247,7 +247,7 @@ offer_suggestions_for_name_error(PyNameErrorObject *exc)
}
suggestions = calculate_suggestions(dir, name);
Py_DECREF(dir);
if (suggestions != NULL) {
if (suggestions != NULL || PyErr_Occurred()) {
return suggestions;
}

Expand Down