summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrett Cannon <bcannon@gmail.com>2011-02-04 20:30:30 (GMT)
committerBrett Cannon <bcannon@gmail.com>2011-02-04 20:30:30 (GMT)
commitf7ef4de3d5e1a9dc4b4ff29d447901def678a7fc (patch)
tree7dea38324cc35154fed24a6d4349a0500fd07a7c
parent8e0ef58f30302a097230f96b4b5f2fd02e9e11c2 (diff)
downloadcpython-f7ef4de3d5e1a9dc4b4ff29d447901def678a7fc.zip
cpython-f7ef4de3d5e1a9dc4b4ff29d447901def678a7fc.tar.gz
cpython-f7ef4de3d5e1a9dc4b4ff29d447901def678a7fc.tar.bz2
Merged revisions 88337 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r88337 | brett.cannon | 2011-02-04 12:24:02 -0800 (Fri, 04 Feb 2011) | 5 lines There was a possibility that the initialization of _sqlite, when it failed, would lead to a decref of a NULL. Fixes issue #11110. ........
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/_sqlite/module.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index b164741..d65a52c 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -37,6 +37,8 @@ Core and Builtins
Library
-------
+- Issue #11110: Fix _sqlite to not deref a NULL when module creation fails.
+
- Issue #11089: Fix performance issue limiting the use of ConfigParser()
with large config files.
diff --git a/Modules/_sqlite/module.c b/Modules/_sqlite/module.c
index 155703c..2ca848d 100644
--- a/Modules/_sqlite/module.c
+++ b/Modules/_sqlite/module.c
@@ -329,7 +329,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void)
(pysqlite_statement_setup_types() < 0) ||
(pysqlite_prepare_protocol_setup_types() < 0)
) {
- Py_DECREF(module);
+ Py_XDECREF(module);
return NULL;
}