jyapayne/murmur3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

decrement reference count on tuple, if error

Browse source
This commit is contained in:
Cameron Eure 2012-10-08 11:24:52 -07:00
commit c9fb76bfc4
1 changed files with 5 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

17
module.cpp
View file

@ -5,13 +5,11 @@ static PyObject* hash32(PyObject *self, PyObject *args)
{ {
char *value = NULL; char *value = NULL;
int len = 0; int len = 0;
int32_t args_len = 0;
uint32_t seed = 0; uint32_t seed = 0;
uint32_t h = 0; uint32_t h = 0;
PyObject *result; PyObject *result;
args_len = (int32_t)PyTuple_Size(args); if (PyTuple_Size(args) == 2) {
if (args_len == 2) {
if (!PyArg_ParseTuple(args, "s#I", &value, &len, &seed)) { if (!PyArg_ParseTuple(args, "s#I", &value, &len, &seed)) {
return NULL; return NULL;
} }
@ -35,14 +33,12 @@ static PyObject *hash128(PyObject *self, PyObject *args)
char *value = NULL; char *value = NULL;
int len = 0; int len = 0;
int i; int i;
int32_t args_len = 0;
uint32_t seed = 0; uint32_t seed = 0;
uint32_t out[4] = {0, 0, 0, 0}; uint32_t out[4] = {0, 0, 0, 0};
PyObject *result; PyObject *result;
PyObject *tmp[4]; PyObject *tmp[4];
args_len = (int32_t)PyTuple_Size(args); if (PyTuple_Size(args) == 2) {
if (args_len == 2) {
if (!PyArg_ParseTuple(args, "s#I", &value, &len, &seed)) { if (!PyArg_ParseTuple(args, "s#I", &value, &len, &seed)) {
return NULL; return NULL;
} }
@ -60,18 +56,15 @@ static PyObject *hash128(PyObject *self, PyObject *args)
return NULL; return NULL;
} }
/* TODO: Does result and tmp[] need to be Py_DECREF()'d on error? */ /* TODO: Does tmp[] need to be Py_DECREF()'d on error? */
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
tmp[i] = PyLong_FromUnsignedLong(out[i]); tmp[i] = PyLong_FromUnsignedLong(out[i]);
if (!tmp[i]) { if (!tmp[i]) {
/* /*for (i--; i > -1; i--) {
for (i--; i > -1; i--) {
Py_DECREF(tmp[i]); Py_DECREF(tmp[i]);
} }*/
Py_DECREF(result); Py_DECREF(result);
*/
PyErr_SetString(PyExc_MemoryError, "PyLong_FromUnsignedLong() returned NULL."); PyErr_SetString(PyExc_MemoryError, "PyLong_FromUnsignedLong() returned NULL.");
return NULL; return NULL;
} }