Merge pull request root-project#46 from Dr15Jones/philippeFixEmptyArr…

…ayIO Philippe's fix for empty array I/O
Dr15Jones · Oct 23, 2014 · 07f1df4 · 07f1df4
2 parents 04ffc30 + 4a3f98d
commit 07f1df4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/hist/hist/inc/TH1.h b/hist/hist/inc/TH1.h
@@ -187,6 +187,7 @@ class TH1 : public TNamed, public TAttLine, public TAttFill, public TAttMarker {
 
    virtual Double_t Chisquare(TF1 * f1, Option_t *option = "") const;
    virtual Double_t ComputeIntegral(Bool_t onlyPositive = false);
+   TObject*         Clone(const char* newname=0) const;
    virtual void     Copy(TObject &hnew) const;
    virtual void     DirectoryAutoAdd(TDirectory *);
    virtual Int_t    DistancetoPrimitive(Int_t px, Int_t py);

diff --git a/hist/hist/src/TH1.cxx b/hist/hist/src/TH1.cxx
@@ -2485,6 +2485,25 @@ void TH1::Copy(TObject &obj) const
 
 }
 
+//______________________________________________________________________________
+TObject* TH1::Clone(const char* newname) const
+{
+  TH1* obj = (TH1*)IsA()->GetNew()(0);
+  Copy(*obj);
+
+  //Now handle the parts that Copy doesn't do
+  if(fFunctions) {
+    if(not obj->fFunctions) {
+      obj->fFunctions = new TList;
+    }
+    fFunctions->Copy( *(obj->fFunctions) );
+  }
+  if(newname and strlen(newname) ) {
+    obj->SetName(newname);
+  }
+  return obj;
+}
+
 //______________________________________________________________________________
 void TH1::DirectoryAutoAdd(TDirectory *dir)
 {

diff --git a/io/io/src/TStreamerInfoReadBuffer.cxx b/io/io/src/TStreamerInfoReadBuffer.cxx
@@ -75,6 +75,10 @@
          f[j] = new name[*l];                   \
          b.ReadFastArray(f[j],*l);              \
       }                                         \
+      else for(j=0;j<fLength[i];j++) {         \
+        delete [] f[j];                        \
+        f[j] = 0;                              \
+     }                                         \
    }
 
 #define ReadBasicPointer(name)                  \