diff options
| author | Dong-hee Na <donghee.na92@gmail.com> | 2017-04-20 08:26:25 (GMT) |
|---|---|---|
| committer | Serhiy Storchaka <storchaka@gmail.com> | 2017-04-20 08:26:25 (GMT) |
| commit | df5df13fdc3a71bcf2295acc2cba7f22cfe2d669 (patch) | |
| tree | da68952721f20db8ad4428596608a985d38d10ed /Objects | |
| parent | 83a90b9aeda3a4c10e8393893ed4ec8adc861e62 (diff) | |
| download | cpython-df5df13fdc3a71bcf2295acc2cba7f22cfe2d669.zip cpython-df5df13fdc3a71bcf2295acc2cba7f22cfe2d669.tar.gz cpython-df5df13fdc3a71bcf2295acc2cba7f22cfe2d669.tar.bz2 | |
[3.6] bpo-12414: Update code_sizeof() to take in account co_extra memory. (#1168) (#1198)
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/codeobject.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Objects/codeobject.c b/Objects/codeobject.c index df8b953..22c4f85 100644 --- a/Objects/codeobject.c +++ b/Objects/codeobject.c @@ -446,11 +446,15 @@ code_dealloc(PyCodeObject *co) static PyObject * code_sizeof(PyCodeObject *co, void *unused) { - Py_ssize_t res; + Py_ssize_t res = _PyObject_SIZE(Py_TYPE(co)); + _PyCodeObjectExtra *co_extra = (_PyCodeObjectExtra*) co->co_extra; - res = _PyObject_SIZE(Py_TYPE(co)); if (co->co_cell2arg != NULL && co->co_cellvars != NULL) - res += PyTuple_GET_SIZE(co->co_cellvars) * sizeof(unsigned char); + res += PyTuple_GET_SIZE(co->co_cellvars) * sizeof(Py_ssize_t); + + if (co_extra != NULL) + res += co_extra->ce_size * sizeof(co_extra->ce_extras[0]); + return PyLong_FromSsize_t(res); } |