mirror/ultrajson
1
0
Fork 0
mirror of https://github.com/ultrajson/ultrajson.git synced 2024-11-24 05:12:02 +01:00
Code Issues

fix ref leaks in datetime code

Browse Source
This commit is contained in:
Kieran O'Mahony 2012-06-12 16:25:40 +01:00
parent 6901f41a7c
commit fd3e969987
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
python/objToJSON.c
View File

@ -99,6 +99,7 @@ static void *PyUnicodeToUTF8(JSOBJ _obj, JSONTypeContext *tc, void *outValue, si
static void *PyDateTimeToINT64(JSOBJ _obj, JSONTypeContext *tc, void *outValue, size_t *_outLen) static void *PyDateTimeToINT64(JSOBJ _obj, JSONTypeContext *tc, void *outValue, size_t *_outLen)
{ {
PyObject *obj = (PyObject *) _obj; PyObject *obj = (PyObject *) _obj;
PyObject *date, *ord;
int y, m, d, h, mn, s, days; int y, m, d, h, mn, s, days;
y = PyDateTime_GET_YEAR(obj); y = PyDateTime_GET_YEAR(obj);
@ -108,7 +109,11 @@ static void *PyDateTimeToINT64(JSOBJ _obj, JSONTypeContext *tc, void *outValue,
mn = PyDateTime_DATE_GET_MINUTE(obj); mn = PyDateTime_DATE_GET_MINUTE(obj);
s = PyDateTime_DATE_GET_SECOND(obj); s = PyDateTime_DATE_GET_SECOND(obj);
days = PyInt_AS_LONG(PyObject_CallMethod(PyDate_FromDate(y, m, 1), "toordinal", NULL)) - EPOCH_ORD + d - 1; date = PyDate_FromDate(y, m, 1);
ord = PyObject_CallMethod(date, "toordinal", NULL);
days = PyInt_AS_LONG(ord) - EPOCH_ORD + d - 1;
Py_DECREF(date);
Py_DECREF(ord);
*( (JSINT64 *) outValue) = (((JSINT64) ((days * 24 + h) * 60 + mn)) * 60 + s); *( (JSINT64 *) outValue) = (((JSINT64) ((days * 24 + h) * 60 + mn)) * 60 + s);
return NULL; return NULL;
} }
@ -116,13 +121,18 @@ static void *PyDateTimeToINT64(JSOBJ _obj, JSONTypeContext *tc, void *outValue,
static void *PyDateToINT64(JSOBJ _obj, JSONTypeContext *tc, void *outValue, size_t *_outLen) static void *PyDateToINT64(JSOBJ _obj, JSONTypeContext *tc, void *outValue, size_t *_outLen)
{ {
PyObject *obj = (PyObject *) _obj; PyObject *obj = (PyObject *) _obj;
PyObject *date, *ord;
int y, m, d, days; int y, m, d, days;
y = PyDateTime_GET_YEAR(obj); y = PyDateTime_GET_YEAR(obj);
m = PyDateTime_GET_MONTH(obj); m = PyDateTime_GET_MONTH(obj);
d = PyDateTime_GET_DAY(obj); d = PyDateTime_GET_DAY(obj);
days = PyInt_AS_LONG(PyObject_CallMethod(PyDate_FromDate(y, m, 1), "toordinal", NULL)) - EPOCH_ORD + d - 1; date = PyDate_FromDate(y, m, 1);
ord = PyObject_CallMethod(date, "toordinal", NULL);
days = PyInt_AS_LONG(ord) - EPOCH_ORD + d - 1;
Py_DECREF(date);
Py_DECREF(ord);
*( (JSINT64 *) outValue) = ((JSINT64) days * 86400); *( (JSINT64 *) outValue) = ((JSINT64) days * 86400);
return NULL; return NULL;