fix Issue 22779 - druntime: Calling __delete with null pointer-to-struct segfaults

ibuclaw · dlang-bot · commit cc1f52689f40 · 2022-02-16T12:25:37.000Z
diff --git a/src/core/memory.d b/src/core/memory.d
@@ -1229,7 +1229,10 @@ void __delete(T)(ref T x) @system
     else static if (is(T == U*, U))
     {
         static if (is(U == struct))
-            _destructRecurse(*x);
+        {
+            if (x)
+                _destructRecurse(*x);
+        }
     }
     else static if (is(T : E[], E))
     {
@@ -1334,6 +1337,10 @@ unittest
     assert(a is null);
     assert(dtorCalled);
     assert(GC.addrOf(cast(void*) a) == null);
+
+    // https://issues.dlang.org/show_bug.cgi?id=22779
+    A *aptr;
+    __delete(aptr);
 }
 
 /// Deleting arrays

Original file line number	Diff line number	Diff line change
`@@ -1229,7 +1229,10 @@ void __delete(T)(ref T x) @system`
`1229`	`1229`	`else static if (is(T == U*, U))`
`1230`	`1230`	`{`
`1231`	`1231`	`static if (is(U == struct))`
`1232`		`- _destructRecurse(*x);`
	`1232`	`+ {`
	`1233`	`+ if (x)`
	`1234`	`+ _destructRecurse(*x);`
	`1235`	`+ }`
`1233`	`1236`	`}`
`1234`	`1237`	`else static if (is(T : E[], E))`
`1235`	`1238`	`{`
`@@ -1334,6 +1337,10 @@ unittest`
`1334`	`1337`	`assert(a is null);`
`1335`	`1338`	`assert(dtorCalled);`
`1336`	`1339`	`assert(GC.addrOf(cast(void*) a) == null);`
	`1340`	`+`
	`1341`	`+ // https://issues.dlang.org/show_bug.cgi?id=22779`
	`1342`	`+ A *aptr;`
	`1343`	`+ __delete(aptr);`
`1337`	`1344`	`}`
`1338`	`1345`
`1339`	`1346`	`/// Deleting arrays`