Merge pull request github#5848 from hvitved/csharp/trap-key-escape

C#: Escape IDs in TRAP label definitions

Author: hvitved

csharp/extractor/Semmle.Extraction.CIL/Context.Factories.cs

@@ -36,7 +36,7 @@ internal T Populate<T>(T e) where T : IExtractedEntity
                         c.Extract(this);
                 });
 #if DEBUG_LABELS
-                using var writer = new StringWriter();
+                using var writer = new EscapingTextWriter();
                 e.WriteId(writer);
                 var id = writer.ToString();
 

csharp/extractor/Semmle.Extraction.CIL/Entities/ArrayType.cs

@@ -29,7 +29,7 @@ public override bool Equals(object? obj)
 
         public override int GetHashCode() => HashCode.Combine(elementType, rank);
 
-        public override void WriteId(TextWriter trapFile, bool inContext)
+        public override void WriteId(EscapingTextWriter trapFile, bool inContext)
         {
             elementType.WriteId(trapFile, inContext);
             trapFile.Write('[');

csharp/extractor/Semmle.Extraction.CIL/Entities/Assembly.cs

@@ -32,7 +32,7 @@ public Assembly(Context cx) : base(cx)
             file = new File(cx, cx.AssemblyPath);
         }
 
-        public override void WriteId(TextWriter trapFile)
+        public override void WriteId(EscapingTextWriter trapFile)
         {
             trapFile.Write(FullName);
             trapFile.Write("#file:///");

csharp/extractor/Semmle.Extraction.CIL/Entities/Base/LabelledEntity.cs

@@ -25,7 +25,7 @@ public void Extract(Context cx2)
 
         public override string ToString()
         {
-            using var writer = new StringWriter();
+            using var writer = new EscapingTextWriter();
             WriteQuotedId(writer);
             return writer.ToString();
         }

csharp/extractor/Semmle.Extraction.CIL/Entities/ByRefType.cs

@@ -33,7 +33,7 @@ public ByRefType(Context cx, Type elementType) : base(cx)
 
         public override void WriteAssemblyPrefix(TextWriter trapFile) => throw new NotImplementedException();
 
-        public override void WriteId(TextWriter trapFile, bool inContext)
+        public override void WriteId(EscapingTextWriter trapFile, bool inContext)
         {
             ElementType.WriteId(trapFile, inContext);
             trapFile.Write('&');

csharp/extractor/Semmle.Extraction.CIL/Entities/ConstructedType.cs

@@ -100,7 +100,7 @@ public override Type Construct(IEnumerable<Type> typeArguments)
             throw new NotImplementedException();
         }
 
-        public override void WriteId(TextWriter trapFile, bool inContext)
+        public override void WriteId(EscapingTextWriter trapFile, bool inContext)
         {
             idWriter.WriteId(trapFile, inContext);
         }

csharp/extractor/Semmle.Extraction.CIL/Entities/ErrorType.cs

@@ -10,7 +10,7 @@ public ErrorType(Context cx) : base(cx)
         {
         }
 
-        public override void WriteId(TextWriter trapFile, bool inContext) => trapFile.Write("<ErrorType>");
+        public override void WriteId(EscapingTextWriter trapFile, bool inContext) => trapFile.Write("<ErrorType>");
 
         public override CilTypeKind Kind => CilTypeKind.ValueOrRefType;
 

csharp/extractor/Semmle.Extraction.CIL/Entities/Event.cs

@@ -20,7 +20,7 @@ public Event(Context cx, Type parent, EventDefinitionHandle handle) : base(cx)
             ed = cx.MdReader.GetEventDefinition(handle);
         }
 
-        public override void WriteId(TextWriter trapFile)
+        public override void WriteId(EscapingTextWriter trapFile)
         {
             parent.WriteId(trapFile);
             trapFile.Write('.');

csharp/extractor/Semmle.Extraction.CIL/Entities/Field.cs

@@ -14,7 +14,7 @@ protected Field(Context cx) : base(cx)
         {
         }
 
-        public override void WriteId(TextWriter trapFile)
+        public override void WriteId(EscapingTextWriter trapFile)
         {
             trapFile.WriteSubId(DeclaringType);
             trapFile.Write('.');

csharp/extractor/Semmle.Extraction.CIL/Entities/File.cs

@@ -14,7 +14,7 @@ public File(Context cx, string path) : base(cx)
             TransformedPath = Context.Extractor.PathTransformer.Transform(OriginalPath);
         }
 
-        public override void WriteId(TextWriter trapFile)
+        public override void WriteId(EscapingTextWriter trapFile)
         {
             trapFile.Write(TransformedPath.DatabaseId);
             trapFile.Write(";sourcefile");