Avoid StackOverflow's in JsConfig.SerializeFn/DeserializeFns

Author: mythz

src/ServiceStack.Text/Common/JsState.cs

@@ -18,6 +18,12 @@ internal static class JsState
         [ThreadStatic]
         internal static bool QueryStringMode = false;
 
+        [ThreadStatic]
+        internal static bool InSerializeFn = false;
+
+        [ThreadStatic]
+        internal static bool InDeserializeFn = false;
+
         [ThreadStatic]
         internal static int Depth = 0;
     }

src/ServiceStack.Text/JsConfig.cs

@@ -748,7 +748,7 @@ public static bool TreatValueAsRefType
         /// </summary>
         public static bool HasSerializeFn
         {
-            get { return serializeFn != null || rawSerializeFn != null; }
+            get { return !JsState.InSerializeFn && (serializeFn != null || rawSerializeFn != null); }
         }
 
         /// <summary>
@@ -802,7 +802,7 @@ public static Action<T> OnSerializedFn
 
         public static bool HasDeserializeFn
         {
-            get { return DeSerializeFn != null || RawDeserializeFn != null; }
+            get { return !JsState.InDeserializeFn && (DeSerializeFn != null || RawDeserializeFn != null); }
         }
 
         private static Func<T, T> onDeserializedFn;
@@ -819,14 +819,30 @@ public static Func<T, T> OnDeserializedFn
 
         public static void WriteFn<TSerializer>(TextWriter writer, object obj)
         {
-            if (RawSerializeFn != null)
-            {
-                writer.Write(RawSerializeFn((T)obj));
-            }
-            else if (SerializeFn != null)
-            {
-                var serializer = JsWriter.GetTypeSerializer<TSerializer>();
-                serializer.WriteString(writer, SerializeFn((T)obj));
+            if (RawSerializeFn != null && !JsState.InSerializeFn)
+            {
+                JsState.InSerializeFn = true;
+                try
+                {
+                    writer.Write(RawSerializeFn((T)obj));
+                }
+                finally
+                {
+                    JsState.InSerializeFn = false;
+                }
+            }
+            else if (SerializeFn != null && !JsState.InSerializeFn)
+            {
+                JsState.InSerializeFn = true;
+                try
+                {
+                    var serializer = JsWriter.GetTypeSerializer<TSerializer>();
+                    serializer.WriteString(writer, SerializeFn((T)obj));
+                }
+                finally
+                {
+                    JsState.InSerializeFn = false;
+                }
             }
             else
             {
@@ -842,13 +858,34 @@ public static object ParseFn(string str)
 
         internal static object ParseFn(ITypeSerializer serializer, string str)
         {
-            if (RawDeserializeFn != null)
-            {
-                return RawDeserializeFn(str);
+            if (RawDeserializeFn != null && !JsState.InDeserializeFn)
+            {
+                JsState.InDeserializeFn = true;
+                try
+                {
+                    return RawDeserializeFn(str);
+                }
+                finally
+                {
+                    JsState.InDeserializeFn = false;
+                }
+            }
+            else if (DeSerializeFn != null && !JsState.InDeserializeFn)
+            {
+                JsState.InDeserializeFn = true;
+                try
+                {
+                    return DeSerializeFn(serializer.UnescapeString(str));
+                }
+                finally
+                {
+                    JsState.InDeserializeFn = false;
+                }
             }
             else
             {
-                return DeSerializeFn(serializer.UnescapeString(str));
+                var parseFn = JsonReader.Instance.GetParseFn<T>();
+                return parseFn(str);
             }
         }
 

tests/ServiceStack.Text.Tests/JsonTests/BasicJsonTests.cs

@@ -537,5 +537,35 @@ public void Explicit_DataMember_attribute_also_applies_to_public_fields()
             Assert.That(person.ToJsv().FromJsv<ModelWithDataMemberField>().Id, Is.EqualTo(1));
             Assert.That(person.ToJson().FromJson<ModelWithDataMemberField>().Id, Is.EqualTo(1));
         }
+
+        [Test]
+        public void Can_include_null_values_for_adhoc_types()
+        {
+            Assert.That(new Foo().ToJson(), Is.EqualTo("{}"));
+
+            JsConfig<Foo>.RawSerializeFn = obj => 
+            {
+                using (JsConfig.With(includeNullValues: true))
+                    return obj.ToJson();
+            };
+
+            Assert.That(new Foo().ToJson(), Is.EqualTo("{\"Bar\":null}"));
+
+            JsConfig.Reset();
+        }
+
+        [Test]
+        public void Can_run_FromJson_within_RawDeserializeFn()
+        {
+            JsConfig<Foo>.RawDeserializeFn = json =>
+            {
+                using (JsConfig.With(includeNullValues: true))
+                    return json.FromJson<Foo>();
+            };
+
+            var obj = "{\"Bar\":\"Bar\"}".FromJson<Foo>();
+
+            Assert.That(obj.Bar, Is.EqualTo("Bar"));
+        }
     }
 }