Added recursion limits to AbstractReader.cs

1 files changed, 11 insertions, 3 deletions

diff --git a/src/ProtocolBuffers/Serialization/DictionaryWriter.cs b/src/ProtocolBuffers/Serialization/DictionaryWriter.cs
index 596a9262..ccfa31f0 100644
--- a/src/ProtocolBuffers/Serialization/DictionaryWriter.cs
+++ b/src/ProtocolBuffers/Serialization/DictionaryWriter.cs
@@ -15,7 +15,7 @@ namespace Google.ProtocolBuffers.Serialization
         /// Constructs a writer using a new dictionary

         /// </summary>

         public DictionaryWriter()

-            : this(new Dictionary<string,object>())

+            : this(new Dictionary<string,object>(StringComparer.Ordinal))

         { }

 

         /// <summary>

@@ -28,6 +28,14 @@ namespace Google.ProtocolBuffers.Serialization
         }

 

         /// <summary>

+        /// Creates the dictionary instance for a child message.

+        /// </summary>

+        protected virtual DictionaryWriter Create()

+        {

+            return new DictionaryWriter();

+        }

+

+        /// <summary>

         /// Accesses the dictionary that is backing this writer

         /// </summary>

         public IDictionary<string, object> ToDictionary() { return _output; }

@@ -119,7 +127,7 @@ namespace Google.ProtocolBuffers.Serialization
         /// </summary>

         protected override void WriteMessageOrGroup(string field, IMessageLite message)

         {

-            DictionaryWriter writer = new DictionaryWriter();

+            DictionaryWriter writer = Create();

             writer.WriteMessage(message);

 

             _output[field] = writer.ToDictionary();

@@ -146,7 +154,7 @@ namespace Google.ProtocolBuffers.Serialization
                     case FieldType.Group:

                     case FieldType.Message:

                         {

-                            DictionaryWriter writer = new DictionaryWriter();

+                            DictionaryWriter writer = Create();

                             writer.WriteMessage((IMessageLite)o);

                             objects.Add(writer.ToDictionary());

                         }