io json: move pointer derefence closer to use.

This avoid the risk of applying the dereference twice.
root-project · Feb 6, 2025 · 7e77f51 · 7e77f51
1 parent b439b74
commit 7e77f51
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/io/io/src/TBufferJSON.cxx b/io/io/src/TBufferJSON.cxx
@@ -671,8 +671,6 @@ TString TBufferJSON::ConvertToJSON(const void *obj, const TClass *cl, Int_t comp
       }
 
       void *ptr = (char *)actualStart + rdata->GetThisOffset();
-      if (member->IsaPointer())
-         ptr = *((char **)ptr);
 
       return TBufferJSON::ConvertToJSON(ptr, member, compact, arraylen);
    }
@@ -723,7 +721,7 @@ TString TBufferJSON::StoreObject(const void *obj, const TClass *cl)
 
 TString TBufferJSON::ConvertToJSON(const void *ptr, TDataMember *member, Int_t compact, Int_t arraylen)
 {
-   if (!ptr || !member)
+   if (!member || !ptr || (member->IsaPointer() && (*(void**)ptr) == nullptr))
       return TString("null");
 
    Bool_t stlstring = !strcmp(member->GetTrueTypeName(), "string");
@@ -733,8 +731,11 @@ TString TBufferJSON::ConvertToJSON(const void *ptr, TDataMember *member, Int_t c
    TClass *mcl = member->IsBasic() ? nullptr : gROOT->GetClass(member->GetTypeName());
 
    if (mcl && (mcl != TString::Class()) && !stlstring && !isstl && (mcl->GetBaseClassOffset(TArray::Class()) != 0) &&
-       (arraylen <= 0) && (member->GetArrayDim() == 0))
+       (arraylen <= 0) && (member->GetArrayDim() == 0)) {
+      if (member->IsaPointer())
+         ptr = *((char **)ptr);
       return TBufferJSON::ConvertToJSON(ptr, mcl, compact);
+   }
 
    TBufferJSON buf;
 
@@ -1019,6 +1020,9 @@ TString TBufferJSON::JsonWriteMember(const void *ptr, TDataMember *member, TClas
    else if (!member->IsBasic() || (tid == kOther_t) || (tid == kVoid_t))
       tid = kNoType_t;
 
+   if (ptr && member->IsaPointer())
+      ptr = *((void **)ptr);
+
    if (!ptr)
       return (tid == kCharStar) ? "\"\"" : "null";