zig

commit 2641feb9b98e794608917231c2fa775ea4daea06 (tree)
parent f1ae688d371f49fdbf65f952d655905c74871fdb
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Sun,  5 Mar 2023 16:32:51 -0500

Merge pull request #14789 from jacobly0/ditype

llvm: fix use after free with pointers to optional slices
Diffstat:
M
src/codegen/llvm.zig
 | 
2
+-
M
test/behavior/slice.zig
 | 
20
++++++++++++++++++++

2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/src/codegen/llvm.zig b/src/codegen/llvm.zig
@@ -1773,7 +1773,7 @@ pub const Object = struct {
                 if (ty.optionalReprIsPayload()) {
                     const ptr_di_ty = try o.lowerDebugType(child_ty, resolve);
                     // The recursive call to `lowerDebugType` means we can't use `gop` anymore.
-                    try o.di_type_map.putContext(gpa, ty, AnnotatedDITypePtr.initFull(ptr_di_ty), .{ .mod = o.module });
+                    try o.di_type_map.putContext(gpa, ty, AnnotatedDITypePtr.init(ptr_di_ty, resolve), .{ .mod = o.module });
                     return ptr_di_ty;
                 }
 
diff --git a/test/behavior/slice.zig b/test/behavior/slice.zig
@@ -747,3 +747,23 @@ test "slice decays to many pointer" {
     const p: [*:0]const u8 = buf[0..7 :0];
     try expectEqualStrings(buf[0..7], std.mem.span(p));
 }
+
+test "write through pointer to optional slice arg" {
+    if (builtin.zig_backend == .stage2_aarch64) return error.SkipZigTest;
+    if (builtin.zig_backend == .stage2_arm) return error.SkipZigTest;
+    if (builtin.zig_backend == .stage2_sparc64) return error.SkipZigTest;
+    if (builtin.zig_backend == .stage2_x86_64) return error.SkipZigTest;
+
+    const S = struct {
+        fn bar(foo: *?[]const u8) !void {
+            foo.* = try baz();
+        }
+
+        fn baz() ![]const u8 {
+            return "ok";
+        }
+    };
+    var foo: ?[]const u8 = null;
+    try S.bar(&foo);
+    try expectEqualStrings(foo.?, "ok");
+}