Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Fix some missing null checks. (GH-118721)

This commit is contained in:
Steve Dower 2024-05-10 10:31:55 +01:00 committed by GitHub
parent 17a2cc199d
commit 7e6fcab200
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Objects/typeobject.c
View File

@ -6036,15 +6036,19 @@ object_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return NULL; return NULL;
} }
comma_w_quotes_sep = PyUnicode_FromString("', '"); comma_w_quotes_sep = PyUnicode_FromString("', '");
joined = PyUnicode_Join(comma_w_quotes_sep, sorted_methods); if (!comma_w_quotes_sep) {
method_count = PyObject_Length(sorted_methods);
Py_DECREF(sorted_methods); Py_DECREF(sorted_methods);
if (joined == NULL) {
Py_DECREF(comma_w_quotes_sep);
return NULL; return NULL;
} }
if (method_count == -1) { joined = PyUnicode_Join(comma_w_quotes_sep, sorted_methods);
Py_DECREF(comma_w_quotes_sep); Py_DECREF(comma_w_quotes_sep);
if (joined == NULL) {
Py_DECREF(sorted_methods);
return NULL;
}
method_count = PyObject_Length(sorted_methods);
Py_DECREF(sorted_methods);
if (method_count == -1) {
Py_DECREF(joined); Py_DECREF(joined);
return NULL; return NULL;
} }
@ -6056,7 +6060,6 @@ object_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
method_count > 1 ? "s" : "", method_count > 1 ? "s" : "",
joined); joined);
Py_DECREF(joined); Py_DECREF(joined);
Py_DECREF(comma_w_quotes_sep);
return NULL; return NULL;
} }
PyObject *obj = type->tp_alloc(type, 0); PyObject *obj = type->tp_alloc(type, 0);

5
PC/launcher2.c
View File

@ -2707,6 +2707,11 @@ process(int argc, wchar_t ** argv)
DWORD len = GetEnvironmentVariableW(L"PYLAUNCHER_LIMIT_TO_COMPANY", NULL, 0); DWORD len = GetEnvironmentVariableW(L"PYLAUNCHER_LIMIT_TO_COMPANY", NULL, 0);
if (len > 1) { if (len > 1) {
wchar_t *limitToCompany = allocSearchInfoBuffer(&search, len); wchar_t *limitToCompany = allocSearchInfoBuffer(&search, len);
if (!limitToCompany) {
exitCode = RC_NO_MEMORY;
winerror(0, L"Failed to allocate internal buffer");
goto abort;
}
search.limitToCompany = limitToCompany; search.limitToCompany = limitToCompany;
if (0 == GetEnvironmentVariableW(L"PYLAUNCHER_LIMIT_TO_COMPANY", limitToCompany, len)) { if (0 == GetEnvironmentVariableW(L"PYLAUNCHER_LIMIT_TO_COMPANY", limitToCompany, len)) {
exitCode = RC_INTERNAL_ERROR; exitCode = RC_INTERNAL_ERROR;