summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiang Zhang <angwerzx@126.com>2017-07-18 16:33:29 (GMT)
committerGitHub <noreply@github.com>2017-07-18 16:33:29 (GMT)
commit4ed5ad79ec6c6270e6018bd0a55656305ee60907 (patch)
treeca395563a5d793cd7d269d5c7dfb5611d5710d47
parentba75af713078966cc594fc7f0809ed53c532c58f (diff)
downloadcpython-4ed5ad79ec6c6270e6018bd0a55656305ee60907.zip
cpython-4ed5ad79ec6c6270e6018bd0a55656305ee60907.tar.gz
cpython-4ed5ad79ec6c6270e6018bd0a55656305ee60907.tar.bz2
bpo-30961: Fix decrementing a borrowed reference in tracemalloc. (#2747)
-rw-r--r--Misc/NEWS.d/next/Library/2017-07-18-23-47-51.bpo-30961.064jz0.rst1
-rw-r--r--Modules/_tracemalloc.c3
2 files changed, 2 insertions, 2 deletions
diff --git a/Misc/NEWS.d/next/Library/2017-07-18-23-47-51.bpo-30961.064jz0.rst b/Misc/NEWS.d/next/Library/2017-07-18-23-47-51.bpo-30961.064jz0.rst
new file mode 100644
index 0000000..b89c6d4
--- /dev/null
+++ b/Misc/NEWS.d/next/Library/2017-07-18-23-47-51.bpo-30961.064jz0.rst
@@ -0,0 +1 @@
+Fix decrementing a borrowed reference in tracemalloc.
diff --git a/Modules/_tracemalloc.c b/Modules/_tracemalloc.c
index 00d3542..d983336 100644
--- a/Modules/_tracemalloc.c
+++ b/Modules/_tracemalloc.c
@@ -1752,7 +1752,7 @@ _PyTraceMalloc_Init(void)
if (key == NULL)
return -1;
- value = PyDict_GetItemWithError(xoptions, key);
+ value = PyDict_GetItemWithError(xoptions, key); /* borrowed */
Py_DECREF(key);
if (value == NULL) {
if (PyErr_Occurred())
@@ -1763,7 +1763,6 @@ _PyTraceMalloc_Init(void)
}
nframe = parse_sys_xoptions(value);
- Py_DECREF(value);
if (nframe < 0) {
Py_FatalError("-X tracemalloc=NFRAME: invalid number of frames");
}