Fix writing out strings with embedded quote marks in custom attributes (

#1038) * Fix writing out strings with embedded quote marks in custom attributes * indent * indent
microsoft · Nov 2, 2021 · 3524776 · 3524776
1 parent 8806f83
commit 3524776
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Tests/TestComponentCSharp/TestComponentCSharp.idl b/src/Tests/TestComponentCSharp/TestComponentCSharp.idl
@@ -538,6 +538,12 @@ And this is another one"
       void f();
     }
 
+    [attr_string("a string with embedded quotes, like the string \"quotes\"")]
+    runtimeclass EmbeddedQuotesTest
+    {
+        void f();
+    }
+
     // Compile time test for sub windows namespace
     namespace Windows
     {

diff --git a/src/cswinrt/code_writers.h b/src/cswinrt/code_writers.h
@@ -1472,7 +1472,17 @@ remove => %;
                 },
                 [&](std::string_view type_name)
                 {
-                    w.write("^@\"%\"", type_name);
+                    std::string sanitized_type_name;
+                    sanitized_type_name.reserve(type_name.length() * 2);
+                    for (const auto& c : type_name)
+                    {
+                        sanitized_type_name += c;
+                        if (c == '"')
+                        {
+                            sanitized_type_name += c;
+                        }
+                    }
+                    w.write("^@\"%\"", sanitized_type_name);
                 },
                 [&](auto&&)
                 {