From b424f56fd67ab12af6ec13d916c8e2e3a3622c8c Mon Sep 17 00:00:00 2001
From: iphydf <iphydf@users.noreply.github.com>
Date: Sat, 13 Jan 2024 14:38:32 +0000
Subject: [PATCH] fix: Add `no-san` to the skipped targets in the msan build.

---
 c-toxcore                       |  2 +-
 ci-tools                        |  2 +-
 hs-cimple                       |  2 +-
 hs-happy-arbitrary              |  2 +-
 hs-toxcore-c                    |  2 +-
 tools/built/src/Dockerfile.msan |  2 +-
 tools/debug/symbolize           | 18 +++++++-----------
 tools/toktok-fuzzer             |  2 +-
 zig-toxcore-c                   |  2 +-
 9 files changed, 15 insertions(+), 19 deletions(-)

diff --git a/c-toxcore b/c-toxcore
index 9325a81b..ba99d4dc 160000
--- a/c-toxcore
+++ b/c-toxcore
@@ -1 +1 @@
-Subproject commit 9325a81b55aa6c3d86f75d38882cdc7ed37a9082
+Subproject commit ba99d4dc4b8c64a64da5036ce49dc91cea5dc51a
diff --git a/ci-tools b/ci-tools
index d827fab4..2c9df97b 160000
--- a/ci-tools
+++ b/ci-tools
@@ -1 +1 @@
-Subproject commit d827fab4bdf146b9f26edd62212b5fd33de88bec
+Subproject commit 2c9df97bce78af93a166bcf356455b15ed6731a1
diff --git a/hs-cimple b/hs-cimple
index 032d57be..7102c955 160000
--- a/hs-cimple
+++ b/hs-cimple
@@ -1 +1 @@
-Subproject commit 032d57be5f8ed4dd782e7c3d10cda72fcc541495
+Subproject commit 7102c95563ee9827dc4aa4f8a84674ae03b68eea
diff --git a/hs-happy-arbitrary b/hs-happy-arbitrary
index f5e40acb..9ade206d 160000
--- a/hs-happy-arbitrary
+++ b/hs-happy-arbitrary
@@ -1 +1 @@
-Subproject commit f5e40acbf451404d8dc586ea4ece806c7767b620
+Subproject commit 9ade206db958cd31f0ba2bbcd2532c6591e7ab7c
diff --git a/hs-toxcore-c b/hs-toxcore-c
index 3c6f0128..2540acd2 160000
--- a/hs-toxcore-c
+++ b/hs-toxcore-c
@@ -1 +1 @@
-Subproject commit 3c6f0128410376962e9a8c430dc71a35364cee73
+Subproject commit 2540acd2285952d68a624462f86eb41235a88920
diff --git a/tools/built/src/Dockerfile.msan b/tools/built/src/Dockerfile.msan
index 1144b232..9a7208af 100644
--- a/tools/built/src/Dockerfile.msan
+++ b/tools/built/src/Dockerfile.msan
@@ -5,6 +5,6 @@ RUN echo 'build --config=msan' >> .bazelrc.local
 
 # Don't build any Go code. It needs sanitizer/msan_interface.h.
 RUN sudo nix-daemon --daemon \
-  & bazel build -k --build_tag_filters='-go,-no-cross' //third_party/...
+  & bazel build -k --build_tag_filters='-go,-no-cross,-no-san' //third_party/...
 
 # vim:ft=dockerfile
diff --git a/tools/debug/symbolize b/tools/debug/symbolize
index 93618130..bfb26b52 100755
--- a/tools/debug/symbolize
+++ b/tools/debug/symbolize
@@ -7,17 +7,13 @@ SYMBOLIZER = (
     "/nix/store/d0r6r274cpcr6gslqx16gn0m38qpy5p3-llvm-16.0.6/bin/llvm-symbolizer"
 )
 
+REGEX = r"\b0x[0-9a-f]{8,}  \(([^ +]*)\+(0x[0-9a-f]+)\)"
+
 for line in sys.stdin:
-    m = re.fullmatch(
-        "#(\d+) (0x[0-9a-f]+)  \((.*)\+(0x[0-9a-f]+)\)( \(BuildId: [0-9a-f]+\))?",
-        line.strip(),
-    )
+    m = re.search(REGEX, line.strip())
     if m:
-        num = m.group(1)
-        addr = m.group(2)
-        prog = m.group(3)
-        off = m.group(4)
-        buildid = m.group(5) or ""
+        prog = m.group(1)
+        off = m.group(2)
 
         try:
             fun = (subprocess.run(
@@ -25,8 +21,8 @@ for line in sys.stdin:
                 check=True,
                 capture_output=True,
             ).stdout.decode("utf-8").split("\n")[0])
-            print(f"    #{num} {fun}")
+            print(re.sub(REGEX, fun, line), end="")
         except subprocess.CalledProcessError:
-            print(f"    #{num} {addr}  ({prog}+{off}){buildid}")
+            print(line, end="")
     else:
         print(line, end="")
diff --git a/tools/toktok-fuzzer b/tools/toktok-fuzzer
index f78e7d3d..c88ca83f 160000
--- a/tools/toktok-fuzzer
+++ b/tools/toktok-fuzzer
@@ -1 +1 @@
-Subproject commit f78e7d3d4640bbfd61a4591832fd8dd11d79bac4
+Subproject commit c88ca83f81f834c8ed5767c69d344fd95d303ea3
diff --git a/zig-toxcore-c b/zig-toxcore-c
index 5c92cab5..981bb1bb 160000
--- a/zig-toxcore-c
+++ b/zig-toxcore-c
@@ -1 +1 @@
-Subproject commit 5c92cab5c97d563623d6d5fde9538a660d9be207
+Subproject commit 981bb1bb9eea6848ece8faf120fc9e3f4842d552