json: write null when const char* = 0

Signed-off-by: Sergey Linev <[email protected]>
saberduck · Nov 7, 2016 · 451bc27 · 451bc27
1 parent e984f21
commit 451bc27
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/io/io/src/TBufferJSON.cxx b/io/io/src/TBufferJSON.cxx
@@ -3047,9 +3047,14 @@ void TBufferJSON::JsonWriteBasic(ULong64_t value)
 
 void TBufferJSON::JsonWriteConstChar(const char* value, Int_t len)
 {
-   fValue.Append("\"");
+   if (value==0) {
+
+      fValue.Append("null");
+
+   } else {
+
+      fValue.Append("\"");
 
-   if (value!=0) {
       if (len<0) len = strlen(value);
 
       for (Int_t n=0;n<len;n++) {
@@ -3086,9 +3091,9 @@ void TBufferJSON::JsonWriteConstChar(const char* value, Int_t len)
                   fValue.Append(TString::Format("\\u%04x", (unsigned) c));
          }
       }
-   }
 
-   fValue.Append("\"");
+      fValue.Append("\"");
+   }
 }