From 2c5ae262f7b98aaf9652dca6b554e204845e9c9e Mon Sep 17 00:00:00 2001
From: nullptrdevs <16590917+nullptrdevs@users.noreply.github.com>
Date: Sun, 21 Aug 2022 17:11:50 -0700
Subject: [PATCH] fix: fix memory leaks related to updating config variables

adds an edge case in analysis.makeScopeInternal to prevent
leaking memory when adding duplicate container fields w/ name "other"
---
 src/Config.zig   | 16 ++++++----------
 src/Server.zig   |  6 +++++-
 src/analysis.zig |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/Config.zig b/src/Config.zig
index 440a4b3..e54c479 100644
--- a/src/Config.zig
+++ b/src/Config.zig
@@ -200,22 +200,18 @@ pub fn configChanged(config: *Config, allocator: std.mem.Allocator, builtin_crea
         config.builtin_path = try std.fs.path.join(allocator, &.{ builtin_creation_dir.?, "builtin.zig" });
     }
 
-    config.build_runner_path = if (config.build_runner_path) |p|
-        try allocator.dupe(u8, p)
-    else blk: {
+    if (null == config.build_runner_path) {
         var exe_dir_bytes: [std.fs.MAX_PATH_BYTES]u8 = undefined;
         const exe_dir_path = try std.fs.selfExeDirPath(&exe_dir_bytes);
-        break :blk try std.fs.path.resolve(allocator, &[_][]const u8{ exe_dir_path, "build_runner.zig" });
-    };
+        config.build_runner_path = try std.fs.path.resolve(allocator, &[_][]const u8{ exe_dir_path, "build_runner.zig" });
+    }
 
-    config.global_cache_path = if (config.global_cache_path) |p|
-        try allocator.dupe(u8, p)
-    else blk: {
+    if (null == config.global_cache_path) {
         const cache_dir_path = (try known_folders.getPath(allocator, .cache)) orelse {
             logger.warn("Known-folders could not fetch the cache path", .{});
             return;
         };
         defer allocator.free(cache_dir_path);
-        break :blk try std.fs.path.resolve(allocator, &[_][]const u8{ cache_dir_path, "zls" });
-    };
+        config.global_cache_path = try std.fs.path.resolve(allocator, &[_][]const u8{ cache_dir_path, "zls" });
+    }
 }
diff --git a/src/Server.zig b/src/Server.zig
index 7923767..e42348b 100644
--- a/src/Server.zig
+++ b/src/Server.zig
@@ -2440,7 +2440,11 @@ pub fn processJsonRpc(server: *Server, writer: anytype, json: []const u8) !void
             if (value != .Null) {
                 const new_value: field.field_type = switch (ft) {
                     []const u8 => switch (value) {
-                        .String => |s| try server.allocator.dupe(u8, s), // TODO: Allocation model? (same with didChangeConfiguration); imo this isn't *that* bad but still
+                        .String => |s| blk: {
+                            var nv = try server.allocator.dupe(u8, s);
+                            server.allocator.free(@field(server.config, field.name).?);
+                            break :blk nv;
+                        }, // TODO: Allocation model? (same with didChangeConfiguration); imo this isn't *that* bad but still
                         else => @panic("Invalid configuration value"), // TODO: Handle this
                     },
                     else => switch (ti) {
diff --git a/src/analysis.zig b/src/analysis.zig
index ea81bc0..cad359a 100644
--- a/src/analysis.zig
+++ b/src/analysis.zig
@@ -2542,7 +2542,7 @@ fn makeInnerScope(allocator: std.mem.Allocator, context: ScopeContext, node_idx:
         };
 
         if (container_field) |_| {
-            if (!std.mem.eql(u8, name, "_")) {
+            if (!std.mem.eql(u8, name, "_") and !std.mem.eql(u8, name, "other")) {
                 try context.enums.put(allocator, .{
                     .label = name,
                     .kind = .Constant,