further sanitization of string in :value attribute

2 files changed, 3 insertions, 2 deletions

diff --git a/BCT/BytecodeTranslator/Heap.cs b/BCT/BytecodeTranslator/Heap.cs
index aaed79e4..731d5e66 100644
--- a/BCT/BytecodeTranslator/Heap.cs
+++ b/BCT/BytecodeTranslator/Heap.cs
@@ -314,8 +314,7 @@ namespace BytecodeTranslator {
       #endregion

 

       #region Parse the declarations

-      var ms = new MemoryStream(ASCIIEncoding.UTF8.GetBytes(preludeText.ToString()));

-      int errorCount = Bpl.Parser.Parse(ms, "foo", new List<string>(), out prelude);

+      int errorCount = Bpl.Parser.Parse(preludeText.ToString(), "foo", out prelude);

       if (prelude == null || errorCount > 0) {

         prelude = null;

         return false;

diff --git a/BCT/BytecodeTranslator/Sink.cs b/BCT/BytecodeTranslator/Sink.cs
index 7a1abc07..d89f1bfd 100644
--- a/BCT/BytecodeTranslator/Sink.cs
+++ b/BCT/BytecodeTranslator/Sink.cs
@@ -331,6 +331,8 @@ namespace BytecodeTranslator {
         var tident = new Bpl.TypedIdent(tok, name, t);

         c = new Bpl.Constant(tok, tident, true);

         str = str.Replace("\n", "\\n");

+        str = str.Replace("\r", "\\r");

+        str = str.Replace("\"", "\u0022");

         var attrib = new Bpl.QKeyValue(Bpl.Token.NoToken, "value", new List<object> { str, }, null);

         c.Attributes = attrib;

         this.declaredStringConstants.Add(str, c);