json: workaround for const char* storage

Convert produced data into normal JSON string. Zero-string converted to null. Signed-off-by: Sergey Linev <[email protected]>
saberduck · Nov 7, 2016 · e2c5725 · e2c5725
1 parent 0d91d94
commit e2c5725
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/io/io/src/TBufferJSON.cxx b/io/io/src/TBufferJSON.cxx
@@ -1389,13 +1389,17 @@ void TBufferJSON::PerformPostProcessing(TJSONStackObj *stack,
 
    const char *typname = elem->IsBase() ? elem->GetName() : elem->GetTypeName();
    Bool_t isTObject = (elem->GetType() == TStreamerInfo::kTObject) || (strcmp("TObject", typname) == 0);
+   Bool_t isCharStar = elem->GetType() == TStreamerInfo::kCharStar;
    Bool_t isTString = elem->GetType() == TStreamerInfo::kTString;
    Bool_t isSTLstring = elem->GetType() == TStreamerInfo::kSTLstring;
    Bool_t isOffsetPArray = (elem->GetType() > TStreamerInfo::kOffsetP) && (elem->GetType() < TStreamerInfo::kOffsetP + 20);
 
    Bool_t isTArray = (strncmp("TArray", typname, 6) == 0);
 
-   if (isTString || isSTLstring) {
+   if (isCharStar) {
+      stack->fValues.Delete();
+      if (fValue == "0") fValue = "null";
+   } else if (isTString || isSTLstring) {
       // just remove all kind of string length information
 
       if (gDebug > 3)