diff options
| author | Serhiy Storchaka <storchaka@gmail.com> | 2018-12-07 16:09:23 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-07 16:09:23 (GMT) |
| commit | 2d6bc25dbc3dc5662f13917eb759f92842bf6de6 (patch) | |
| tree | d1dde41b6c7e9c5dafa95703bd4f0a4ab6b2bfb7 /Python/pystrtod.c | |
| parent | 19f6e83bf03b3ce22300638906bd90dd2dd5c463 (diff) | |
| download | cpython-2d6bc25dbc3dc5662f13917eb759f92842bf6de6.zip cpython-2d6bc25dbc3dc5662f13917eb759f92842bf6de6.tar.gz cpython-2d6bc25dbc3dc5662f13917eb759f92842bf6de6.tar.bz2 | |
bpo-35436: Add missing PyErr_NoMemory() calls and other minor bug fixes. (GH-11015) (GH-11020) (GH-11026)
(cherry picked from commit 4c49da0cb7434c676d70b9ccf38aca82ac0d64a9)
(cherry picked from commit 602d307ac5e8a2da38a193dca3bdfef5994dfe67)
Co-authored-by: Zackery Spytz <zspytz@gmail.com>
Diffstat (limited to 'Python/pystrtod.c')
| -rw-r--r-- | Python/pystrtod.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Python/pystrtod.c b/Python/pystrtod.c index 1c63560..509048c 100644 --- a/Python/pystrtod.c +++ b/Python/pystrtod.c @@ -398,6 +398,9 @@ _Py_string_to_number_with_underscores( } dup = PyMem_Malloc(orig_len + 1); + if (dup == NULL) { + return PyErr_NoMemory(); + } end = dup; prev = '\0'; last = s + orig_len; @@ -433,8 +436,8 @@ _Py_string_to_number_with_underscores( error: PyMem_Free(dup); PyErr_Format(PyExc_ValueError, - "could not convert string to %s: " - "%R", what, obj); + "could not convert string to %s: " + "%R", what, obj); return NULL; } |