Merge branch 'main' into dev/garretts/instrumentation

Author: fearthecowboy

Extension/CHANGELOG.md

@@ -1,6 +1,12 @@
 # C/C++ for Visual Studio Code Changelog
 
-## Version 1.24.0: Febrary 11, 2025
+## Version 1.24.1: February 13, 2025
+### Bug Fixes
+* Fix random IntelliSense process crashes on Linux/macOS when `C_Cpp.intelliSenseCacheSize` is > 0. [#12668](https://github.com/microsoft/vscode-cpptools/issues/12668)
+* Fix a crash when processing Copilot snippets.
+* Fix a crash when using Copilot hover.
+
+## Version 1.24.0: February 11, 2025
 ### New Feature
 * Add experimental support for Copilot descriptions in hover tooltips, controlled by the `C_Cpp.copilotHover` setting. This feature is currently off by default and may be subject to A/B experimentation. To opt-out of Copilot Hover experiments, set `C_Cpp.copilotHover` to `disabled`.
 

Extension/package.json

@@ -2,7 +2,7 @@
     "name": "cpptools",
     "displayName": "C/C++",
     "description": "C/C++ IntelliSense, debugging, and code browsing.",
-    "version": "1.24.0-main",
+    "version": "1.24.1-main",
     "publisher": "ms-vscode",
     "icon": "LanguageCCPP_color_128x.png",
     "readme": "README.md",

Extension/src/LanguageServer/extension.ts

@@ -1224,7 +1224,7 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
             if (ret?.output === funcStr) {
                 ret = await util.spawnChildProcess(filtPath, [funcStr], undefined, true).catch(logAndReturn.undefined);
             }
-            if (ret !== undefined && ret.succeeded) {
+            if (ret !== undefined && ret.succeeded && !ret.output.startsWith("Could not open input file")) {
                 funcStr = ret.output;
                 funcStr = funcStr.replace(/std::(?:__1|__cxx11)/g, "std"); // simplify std namespaces.
                 funcStr = funcStr.replace(/std::basic_/g, "std::");
@@ -1235,7 +1235,11 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
             }
         }
         if (funcStr.includes("/")) {
-            funcStr = "<func>";
+            funcStr = "<funcForwardSlash>";
+        } else if (funcStr.includes("\\")) {
+            funcStr = "<funcBackSlash>";
+        } else if (funcStr.includes("@")) {
+            funcStr = "<funcAt>";
         } else if (!validFrameFound && (funcStr.startsWith("crash_handler(") || funcStr.startsWith("_sigtramp"))) {
             continue; // Skip these on early frames.
         }
@@ -1246,8 +1250,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
         const offsetPos2: number = offsetPos + offsetStr.length;
         if (isMac) {
             const pendingOffset: string = line.substring(offsetPos2);
-            if (!pendingOffset.includes("/")) {
+            if (!pendingOffset.includes("/") && !pendingOffset.includes("\\") && !pendingOffset.includes("@")) {
                 crashCallStack += pendingOffset;
+            } else {
+                crashCallStack += "<offsetUnexpectedCharacter>";
             }
             const startAddressPos: number = line.indexOf("0x");
             if (startAddressPos === -1 || startAddressPos >= startPos) {
@@ -1263,8 +1269,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
                 continue; // unexpected
             }
             const pendingOffset: string = line.substring(offsetPos2, endPos);
-            if (!pendingOffset.includes("/")) {
+            if (!pendingOffset.includes("/") && !pendingOffset.includes("\\") && !pendingOffset.includes("@")) {
                 crashCallStack += pendingOffset;
+            } else {
+                crashCallStack += "<offsetUnexpectedCharacter>";
             }
         }
     }
@@ -1283,6 +1291,10 @@ async function handleCrashFileRead(crashDirectory: string, crashFile: string, cr
         data = data.substring(0, 8191) + "…";
     }
 
+    if (addressData.includes("/") || addressData.includes("\\") || addressData.includes("@")) {
+        addressData = "<addressDataUnexpectedCharacter>";
+    }
+
     logCppCrashTelemetry(data, addressData);
 
     await util.deleteFile(path.resolve(crashDirectory, crashFile)).catch(logAndReturn.undefined);