diff options
| author | njsmith <njs@pobox.com> | 2012-06-10 04:33:24 -0700 |
|---|---|---|
| committer | njsmith <njs@pobox.com> | 2012-06-10 04:33:24 -0700 |
| commit | a0d1a961a9e3428d378e2189b8c337cc629a2fae (patch) | |
| tree | 17737cf523197e5681516470d0f2fcd81644b3a8 /numpy | |
| parent | d0f520a30990c018114672f24197866452a2d088 (diff) | |
| parent | 3dbfaa06b45b89b6163574e5349526032920e11b (diff) | |
| download | numpy-a0d1a961a9e3428d378e2189b8c337cc629a2fae.tar.gz | |
Merge pull request #304 from thouis/datetime_refcnt
fix previous patch: c_metadata should match metadata before DECREF
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/descriptor.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c index 218ad72ac..b10f9eb85 100644 --- a/numpy/core/src/multiarray/descriptor.c +++ b/numpy/core/src/multiarray/descriptor.c @@ -2549,11 +2549,11 @@ arraydescr_setstate(PyArray_Descr *self, PyObject *args) old_metadata = self->metadata; self->metadata = PyTuple_GET_ITEM(metadata, 0); - Py_XINCREF(self->metadata); - Py_XDECREF(old_metadata); memcpy((char *) &((PyArray_DatetimeDTypeMetaData *)self->c_metadata)->meta, (char *) &temp_dt_data, sizeof(PyArray_DatetimeMetaData)); + Py_XINCREF(self->metadata); + Py_XDECREF(old_metadata); } else { PyObject *old_metadata = self->metadata; |