[Python-checkins] r79234 - in python/branches/release31-maint: Modules/_sqlite/connection.c

Sun Mar 21 21:05:51 CET 2010

Author: victor.stinner
Date: Sun Mar 21 21:05:51 2010
New Revision: 79234
Log:
Merged revisions 78894 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
 r78894 | victor.stinner | 2010年03月13日 01:57:22 +0100 (sam., 13 mars 2010) | 4 lines
 
 sqlite3: Fix _PyUnicode_AsStringAndSize() error handler.
 
 Destroy begin_statement (not statement) on error.
........
Modified:
 python/branches/release31-maint/ (props changed)
 python/branches/release31-maint/Modules/_sqlite/connection.c
Modified: python/branches/release31-maint/Modules/_sqlite/connection.c
==============================================================================

--- python/branches/release31-maint/Modules/_sqlite/connection.c	(original)
+++ python/branches/release31-maint/Modules/_sqlite/connection.c	Sun Mar 21 21:05:51 2010
@@ -941,7 +941,7 @@
 
 statement = _PyUnicode_AsStringAndSize(begin_statement, &size);
 if (!statement) {
- Py_DECREF(statement);
+ Py_DECREF(begin_statement);
 return -1;
 }
 self->begin_statement = PyMem_Malloc(size + 2);
