Skip to content

Fix an issue with string escaping #501

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
Nov 26, 2023
Merged

Fix an issue with string escaping #501

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.VisitDecl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3336,7 +3336,7 @@ private void VisitVarDecl(VarDecl varDecl)
_ = nativeTypeNameBuilder.Append(' ');

var macroValue = GetSourceRangeContents(varDecl.TranslationUnit.Handle, varDecl.Init.Extent);
_ = nativeTypeNameBuilder.Append(macroValue);
_ = nativeTypeNameBuilder.Append(macroValue.Replace(@"\\", "\\", StringComparison.Ordinal));

nativeTypeName = nativeTypeNameBuilder.ToString();
}
Expand Down
3 changes: 1 addition & 2 deletions sources/ClangSharp.PInvokeGenerator/PInvokeGenerator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2344,8 +2344,7 @@ private string EscapeAndStripName(string name)

// We first replace already escaped characters with their raw counterpart
// We then re-escape any raw characters. This ensures we don't end up with double escaped backslashes
internal static string EscapeString(string value) => value.Replace(@"\\", "\\", StringComparison.Ordinal)
.Replace(@"\0", "\0", StringComparison.Ordinal)
internal static string EscapeString(string value) => value.Replace(@"\0", "\0", StringComparison.Ordinal)
.Replace(@"\r", "\r", StringComparison.Ordinal)
.Replace(@"\n", "\n", StringComparison.Ordinal)
.Replace(@"\t", "\t", StringComparison.Ordinal)
Expand Down