Skip to content

Commit 8cbb3ca

Browse files
authored
Merge pull request github#5947 from hvitved/csharp/encode-display-name
C#: Encode `"` in `BuildDisplayName`
2 parents b33adb8 + 2a33756 commit 8cbb3ca

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

csharp/extractor/Semmle.Extraction.CSharp/SymbolExtensions.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,7 @@ public static void BuildDisplayName(this ITypeSymbol type, Context cx, TextWrite
373373
var elementType = array.ElementType;
374374
if (elementType.MetadataName.Contains("`"))
375375
{
376-
trapFile.Write(elementType.Name);
376+
trapFile.Write(TrapExtensions.EncodeString(elementType.Name));
377377
return;
378378
}
379379
elementType.BuildDisplayName(cx, trapFile);
@@ -480,7 +480,7 @@ private static void BuildNamedTypeDisplayName(this INamedTypeSymbol namedType, C
480480
}
481481
else
482482
{
483-
trapFile.Write(namedType.Name);
483+
trapFile.Write(TrapExtensions.EncodeString(namedType.Name));
484484
}
485485

486486
if (namedType.IsGenericType && namedType.TypeKind != TypeKind.Error && namedType.TypeArguments.Any())

csharp/extractor/Semmle.Extraction/TrapExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ private static string TruncateString(string s, ref int bytesRemaining)
117117
return s;
118118
}
119119

120-
private static string EncodeString(string s) => s.Replace("\"", "\"\"");
120+
public static string EncodeString(string s) => s.Replace("\"", "\"\"");
121121

122122
/// <summary>
123123
/// Output a string to the trap file, such that the encoded output does not exceed

0 commit comments

Comments
 (0)