rays/pylibmc
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix crashes in client allocation and deallocation routines.

Browse Source
This commit is contained in:
lericson 2009-11-26 13:19:50 +01:00
parent 78c3475e96
commit 9fec8f59f6
2 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
_pylibmcmodule.c
View File

@ -40,18 +40,23 @@ static PylibMC_Client *PylibMC_ClientType_new(PyTypeObject *type,
PyObject *args, PyObject *kwds) { PyObject *args, PyObject *kwds) {
PylibMC_Client *self; PylibMC_Client *self;
self = (PylibMC_Client *)type->tp_alloc(type, 0); /* GenericNew calls GenericAlloc (via the indirection type->tp_alloc) which
* adds GC tracking if flagged for, and also calls PyObject_Init. */
self = (PylibMC_Client *)PyType_GenericNew(type, args, kwds);
if (self != NULL) { if (self != NULL) {
self->mc = memcached_create(NULL); self->mc = memcached_create(NULL);
} else {
args = kwds = NULL;
} }
return self; return self;
} }
static void PylibMC_ClientType_dealloc(PylibMC_Client *self) { static void PylibMC_ClientType_dealloc(PylibMC_Client *self) {
memcached_free(self->mc); if (self->mc != NULL) {
memcached_free(self->mc);
}
self->ob_type->tp_free(self);
} }
/* }}} */ /* }}} */
@ -860,7 +865,7 @@ static PyObject *PylibMC_Client_flush_all(PylibMC_Client *self,
rc = memcached_flush(self->mc, expire); rc = memcached_flush(self->mc, expire);
if (rc != MEMCACHED_SUCCESS) if (rc != MEMCACHED_SUCCESS)
return PylibMC_ErrFromMemcached(self, "delete_multi", rc); return PylibMC_ErrFromMemcached(self, "flush_all", rc);
Py_RETURN_TRUE; Py_RETURN_TRUE;
} }
@ -871,18 +876,17 @@ static PyObject *PylibMC_Client_disconnect_all(PylibMC_Client *self) {
} }
static PyObject *PylibMC_Client_clone(PylibMC_Client *self) { static PyObject *PylibMC_Client_clone(PylibMC_Client *self) {
PylibMC_Client *new_self; /* Essentially this is a reimplementation of the allocator, only it uses a
* cloned memcached_st for mc. */
PylibMC_Client *clone;
/* XXX Is it really wise to short-circuit like this? I don't see a problem clone = (PylibMC_Client *)PyType_GenericNew(self->ob_type, NULL, NULL);
* with it. */ if (clone == NULL) {
new_self = (PylibMC_Client *)self->ob_type->tp_new(self->ob_type, NULL, NULL);
if (new_self == NULL) {
return NULL; return NULL;
} }
memset(new_self->mc, 0, sizeof(memcached_st));
new_self->mc = memcached_clone(new_self->mc, self->mc);
return (PyObject *)new_self; clone->mc = memcached_clone(NULL, self->mc);
return (PyObject *)clone;
} }
/* }}} */ /* }}} */

2
_pylibmcmodule.h
View File

@ -298,7 +298,7 @@ static PyTypeObject PylibMC_ClientType = {
0, 0,
(initproc)PylibMC_Client_init, (initproc)PylibMC_Client_init,
0, 0,
(newfunc)PylibMC_ClientType_new, (newfunc)PylibMC_ClientType_new, //PyType_GenericNew,
0, 0,
0, 0,
0, 0,