Merge pull request #4176 from BBasile/issue-15884

fix issue 15884 - Assigning char[] to std.json.JSONValue creates array, not string
dlang · Apr 11, 2016 · ada161f · ada161f
2 parents 11f8935 + 329f068
commit ada161f
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/std/json.d b/std/json.d
@@ -346,6 +346,11 @@ struct JSONValue
             type_tag = JSON_TYPE.STRING;
             store.str = arg;
         }
+        else static if(is(T : char[]))
+        {
+            type_tag = JSON_TYPE.STRING;
+            store.str = arg.idup;
+        }
         else static if(is(T : bool))
         {
             type_tag = arg ? JSON_TYPE.TRUE : JSON_TYPE.FALSE;
@@ -1692,3 +1697,10 @@ pure nothrow @safe @nogc unittest
     testVal = null;
     assert(testVal.isNull);
 }
+
+pure nothrow @safe unittest // issue 15884
+{
+    char[] str = "a".dup;
+    JSONValue testVal = str;
+    assert(testVal.type == JSON_TYPE.STRING);
+}