python/mysqlclient
1
0
Fork 0
mirror of https://github.com/PyMySQL/mysqlclient.git synced 2026-03-13 08:00:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Find and plug memory leak.

Browse Source
This commit is contained in:
adustman
2001-03-12 02:58:03 +00:00
parent eb93d359e4
commit 84bedad4a4
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mysql/MySQLdb.py
View File

@@ -62,13 +62,13 @@ type_conv = { FIELD_TYPE.TINY: int,
try:
try:
from mx import DateTime # new packaging
from mx.DateTime import Date, Time, Timestamp, ISO, \
DateTimeType, DateTimeDeltaType
from mx import DateTime # new packaging
from mx.DateTime import Date, Time, Timestamp, ISO, \
DateTimeType, DateTimeDeltaType
except ImportError:
import DateTime # old packaging
from DateTime import Date, Time, Timestamp, ISO, \
DateTimeType, DateTimeDeltaType
import DateTime # old packaging
from DateTime import Date, Time, Timestamp, ISO, \
DateTimeType, DateTimeDeltaType
def DateFromTicks(ticks):
return apply(Date, localtime(ticks)[:3])

11
mysql/_mysqlmodule.c
View File

@@ -86,6 +86,7 @@ _mysql_Exception(_mysql_ConnectionObject *c)
PyTuple_SET_ITEM(t, 0, PyInt_FromLong(-1L));
PyTuple_SET_ITEM(t, 1, PyString_FromString("error totally whack"));
PyErr_SetObject(_mysql_Error, t);
Py_DECREF(t);
return NULL;
}
else switch (merr) {
@@ -142,7 +143,7 @@ _mysql_ResultObject_New(
PyObject *tmp, *fun;
tmp = PyInt_FromLong((long) fields[i].type);
fun = PyObject_GetItem(conv, tmp);
Py_XDECREF(tmp);
Py_DECREF(tmp);
if (!fun) {
PyErr_Clear();
fun = Py_None;
@@ -365,7 +366,7 @@ _escape_item(
PyObject *item,
PyObject *d)
{
PyObject *quoted, *itemtype, *itemconv;
PyObject *quoted=NULL, *itemtype, *itemconv;
if (!(itemtype = PyObject_Type(item)))
goto error;
itemconv = PyObject_GetItem(d, itemtype);
@@ -382,10 +383,8 @@ _escape_item(
}
quoted = PyObject_CallFunction(itemconv, "OO", item, d);
Py_DECREF(itemconv);
if (!quoted) goto error;
error:
return quoted;
error:
return NULL;
}
static PyObject *
@@ -422,7 +421,9 @@ _mysql_escape_sequence(
if (!(r = PyTuple_New(n))) goto error;
for (i=0; i<n; i++) {
item = PySequence_GetItem(o, i);
if (!item) goto error;
quoted = _escape_item(item, d);
Py_DECREF(item);
if (!quoted) goto error;
PyTuple_SET_ITEM(r, i, quoted);
}