summaryrefslogtreecommitdiffstats
path: root/Modules/_sqlite/statement.c
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2013-02-07 15:01:47 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2013-02-07 15:01:47 (GMT)
commit3cf96ac2484d093bea17610480efd0e88301f72a (patch)
treebb932dd53295a2214a1a208141ecf4793cb153be /Modules/_sqlite/statement.c
parent3fd4ab356d76b048f2dbd25797fec87f68dd7f73 (diff)
downloadcpython-3cf96ac2484d093bea17610480efd0e88301f72a.zip
cpython-3cf96ac2484d093bea17610480efd0e88301f72a.tar.gz
cpython-3cf96ac2484d093bea17610480efd0e88301f72a.tar.bz2
Issue #17073: Fix some integer overflows in sqlite3 module.
Diffstat (limited to 'Modules/_sqlite/statement.c')
-rw-r--r--Modules/_sqlite/statement.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/Modules/_sqlite/statement.c b/Modules/_sqlite/statement.c
index 80bcc38..09d95d9 100644
--- a/Modules/_sqlite/statement.c
+++ b/Modules/_sqlite/statement.c
@@ -26,6 +26,7 @@
#include "connection.h"
#include "microprotocols.h"
#include "prepare_protocol.h"
+#include "util.h"
#include "sqlitecompat.h"
/* prototypes */
@@ -90,7 +91,6 @@ int pysqlite_statement_create(pysqlite_Statement* self, pysqlite_Connection* con
int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObject* parameter, int allow_8bit_chars)
{
int rc = SQLITE_OK;
- PY_LONG_LONG longlongval;
const char* buffer;
char* string;
Py_ssize_t buflen;
@@ -120,11 +120,14 @@ int pysqlite_statement_bind_parameter(pysqlite_Statement* self, int pos, PyObjec
}
switch (paramtype) {
- case TYPE_LONG:
- /* in the overflow error case, longval/longlongval is -1, and an exception is set */
- longlongval = PyLong_AsLongLong(parameter);
- rc = sqlite3_bind_int64(self->st, pos, (sqlite_int64)longlongval);
+ case TYPE_LONG: {
+ sqlite_int64 value = _pysqlite_long_as_int64(parameter);
+ if (value == -1 && PyErr_Occurred())
+ rc = -1;
+ else
+ rc = sqlite3_bind_int64(self->st, pos, value);
break;
+ }
case TYPE_FLOAT:
rc = sqlite3_bind_double(self->st, pos, PyFloat_AsDouble(parameter));
break;