Skip to content

Check for more unexpected characters in crash call stack data. #13281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 13, 2025
Merged

Check for more unexpected characters in crash call stack data. #13281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 15 additions & 3 deletions Extension/src/LanguageServer/extension.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
}
Expand All @@ -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) {
Expand All @@ -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>";
}
}
}
Expand All @@ -1285,6 +1293,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);
Expand Down
Loading