diff options
author | Charles Harris <charlesr.harris@gmail.com> | 2013-05-27 13:13:53 -0700 |
---|---|---|
committer | Charles Harris <charlesr.harris@gmail.com> | 2013-05-27 13:13:53 -0700 |
commit | 14f83a6f87f00e669d645af6e74a565d449041ce (patch) | |
tree | ad404e673e10987859ae3a84497e81e2bdf304b4 /numpy | |
parent | 00b2d78cbd025bfc4d1deadfcc244c6c00447350 (diff) | |
parent | 4eff7cb77c9af86442780ab4829ef95d9649ecdb (diff) | |
download | numpy-14f83a6f87f00e669d645af6e74a565d449041ce.tar.gz |
Merge pull request #3372 from juliantaylor/datetime-leak
BUG: fix leak and possible use after free
Diffstat (limited to 'numpy')
-rw-r--r-- | numpy/core/src/multiarray/arraytypes.c.src | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src index 4a5c13a6a..217a5ddaa 100644 --- a/numpy/core/src/multiarray/arraytypes.c.src +++ b/numpy/core/src/multiarray/arraytypes.c.src @@ -3971,7 +3971,7 @@ initialize_builtin_datetime_metadata(void) data2->meta.num = 1; _builtin_descrs[NPY_DATETIME]->c_metadata = (NpyAuxData *)data1; - _builtin_descrs[NPY_TIMEDELTA]->c_metadata = (NpyAuxData *)data1; + _builtin_descrs[NPY_TIMEDELTA]->c_metadata = (NpyAuxData *)data2; return 0; } |