Merge pull request #158 from dayllenger/fix-segfault

dlang-bot · web-flow · commit cc6fe5e1bed3 · 2020-03-06T19:25:25.000+01:00
Fix a segfault
merged-on-behalf-of: Brian Schott &lt;Hackerpilot@users.noreply.github.com&gt;
diff --git a/src/containers/dynamicarray.d b/src/containers/dynamicarray.d
@@ -125,13 +125,15 @@ struct DynamicArray(T, Allocator = Mallocator, bool supportGC = shouldAddGCRange
 		else if (l >= arr.length)
 		{
 			immutable size_t c = arr.length > 512 ? arr.length + 1024 : arr.length << 1;
+			static if (useGC)
+				void* oldPtr = arr.ptr;
 			void[] a = cast(void[]) arr;
 			allocator.reallocate(a, c * T.sizeof);
 			arr = cast(typeof(arr)) a;
 			static if (useGC)
 			{
 				import core.memory: GC;
-				GC.removeRange(arr.ptr);
+				GC.removeRange(oldPtr);
 				GC.addRange(arr.ptr, arr.length * T.sizeof);
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -125,13 +125,15 @@ struct DynamicArray(T, Allocator = Mallocator, bool supportGC = shouldAddGCRange`
`125`	`125`	`else if (l >= arr.length)`
`126`	`126`	`{`
`127`	`127`	`immutable size_t c = arr.length > 512 ? arr.length + 1024 : arr.length << 1;`
	`128`	`+ static if (useGC)`
	`129`	`+ void* oldPtr = arr.ptr;`
`128`	`130`	`void[] a = cast(void[]) arr;`
`129`	`131`	`allocator.reallocate(a, c * T.sizeof);`
`130`	`132`	`arr = cast(typeof(arr)) a;`
`131`	`133`	`static if (useGC)`
`132`	`134`	`{`
`133`	`135`	`import core.memory: GC;`
`134`		`- GC.removeRange(arr.ptr);`
	`136`	`+ GC.removeRange(oldPtr);`
`135`	`137`	`GC.addRange(arr.ptr, arr.length * T.sizeof);`
`136`	`138`	`}`
`137`	`139`	`}`