From 68a576bc552af1a5484fda9d5e28eff7ca5a2364 Mon Sep 17 00:00:00 2001 From: Sebastian Gniazdowski Date: Tue, 8 Nov 2016 02:27:04 -0800 Subject: 39869: can transfer ownership of core of array when assigning --- Src/params.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'Src') diff --git a/Src/params.c b/Src/params.c index 330f22bb2..0894241b9 100644 --- a/Src/params.c +++ b/Src/params.c @@ -2647,15 +2647,20 @@ setarrvalue(Value v, char **val) for (i = 0; i < v->start; i++) *p++ = i < pre_assignment_length ? ztrdup(*q++) : ztrdup(""); - for (r = val; *r;) - *p++ = ztrdup(*r++); + for (r = val; *r;) { + /* Give away ownership of the string */ + *p++ = *r++; + } if (v->end < pre_assignment_length) for (q = old + v->end; *q;) *p++ = ztrdup(*q++); *p = NULL; v->pm->gsu.a->setfn(v->pm, new); - freearray(val); + + /* Ownership of all strings has been + * given away, can plainly free */ + free(val); } } -- cgit 1.4.1