Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 24 insertions, 0 deletions

diff --git a/tests/ui/cleanup-shortcircuit.rs b/tests/ui/cleanup-shortcircuit.rs
new file mode 100644
index 000000000..fe867ce1f
--- /dev/null
+++ b/tests/ui/cleanup-shortcircuit.rs
@@ -0,0 +1,24 @@
+// run-pass
+// Test that cleanups for the RHS of shortcircuiting operators work.
+
+// pretty-expanded FIXME #23616
+
+#![allow(deref_nullptr)]
+
+
+use std::env;
+
+pub fn main() {
+    let args: Vec<String> = env::args().collect();
+
+    // Here, the rvalue `"signal".to_string()` requires cleanup. Older versions
+    // of the code had a problem that the cleanup scope for this
+    // expression was the end of the `if`, and as the `"signal".to_string()`
+    // expression was never evaluated, we wound up trying to clean
+    // uninitialized memory.
+
+    if args.len() >= 2 && args[1] == "signal" {
+        // Raise a segfault.
+        unsafe { *std::ptr::null_mut::<isize>() = 0; }
+    }
+}