Merged revisions 88337 via svnmerge from

brettcannon · brettcannon · commit f7ef4de3d5e1 · 2011-02-04T20:30:30.000Z
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. ........
diff --git 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
@@ -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;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,7 @@ PyMODINIT_FUNC PyInit__sqlite3(void)`
`329`	`329`	`(pysqlite_statement_setup_types() < 0) \|\|`
`330`	`330`	`(pysqlite_prepare_protocol_setup_types() < 0)`
`331`	`331`	`) {`
`332`		`- Py_DECREF(module);`
	`332`	`+ Py_XDECREF(module);`
`333`	`333`	`return NULL;`
`334`	`334`	`}`
`335`	`335`