diff options
| author | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:50 -0800 |
|---|---|---|
| committer | Steve Dower <steve.dower@microsoft.com> | 2017-02-04 15:05:50 -0800 |
| commit | 3b0e4320092ac0504b6670cafaf0301b908c91fc (patch) | |
| tree | d3be1b6b844d61763bb366fa21ceed475e5703fd /Objects/stringlib/unicode_format.h | |
| parent | b2fa705fd3887c326e811c418469c784353027f4 (diff) | |
| parent | f687fbcd73c14dfcbe086eb5cd94b298f1e81e72 (diff) | |
| download | cpython-3b0e4320092ac0504b6670cafaf0301b908c91fc.tar.gz | |
Issue #29392: Prevent crash when passing invalid arguments into msvcrt module.
Diffstat (limited to 'Objects/stringlib/unicode_format.h')
| -rw-r--r-- | Objects/stringlib/unicode_format.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Objects/stringlib/unicode_format.h b/Objects/stringlib/unicode_format.h index 14fa28ea54..7ac0d75166 100644 --- a/Objects/stringlib/unicode_format.h +++ b/Objects/stringlib/unicode_format.h @@ -60,10 +60,8 @@ SubString_init(SubString *str, PyObject *s, Py_ssize_t start, Py_ssize_t end) Py_LOCAL_INLINE(PyObject *) SubString_new_object(SubString *str) { - if (str->str == NULL) { - Py_INCREF(Py_None); - return Py_None; - } + if (str->str == NULL) + Py_RETURN_NONE; return PyUnicode_Substring(str->str, str->start, str->end); } |