From 94c2145ae5de692cfd118729e321f6a770d013a4 Mon Sep 17 00:00:00 2001 From: David Nadlinger Date: Fri, 22 Apr 2011 18:57:30 +0200 Subject: [PATCH] Merged DMD commit 65e5c33d572077b43385744bb559fc760b4f91d1: fix 2 issues spotted by valgrind --- dmd/root/aav.c | 2 +- dmd/root/array.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dmd/root/aav.c b/dmd/root/aav.c index f3036701..67ff2585 100644 --- a/dmd/root/aav.c +++ b/dmd/root/aav.c @@ -161,7 +161,7 @@ void _aaRehash(AA** paa) } } if (aa->b != aa->binit) - delete aa->b; + delete[] aa->b; newb.nodes = aa->nodes; } diff --git a/dmd/root/array.c b/dmd/root/array.c index 50b31f21..f0e63c9f 100644 --- a/dmd/root/array.c +++ b/dmd/root/array.c @@ -177,7 +177,8 @@ void Array::append(Array *a) void Array::remove(unsigned i) { - memmove(data + i, data + i + 1, (dim - i - 1) * sizeof(data[0])); + if (dim - i - 1) + memmove(data + i, data + i + 1, (dim - i - 1) * sizeof(data[0])); dim--; }