Fixes for 5 coverity defect reports

io/io/src/TFileMerger.cxx

@@ -219,7 +219,7 @@ Bool_t TFileMerger::AddAdoptFile(TFile *source, Bool_t cpProgress)
 
 Bool_t TFileMerger::AddFile(TFile *source, Bool_t own, Bool_t cpProgress)
 {
-   if (source == 0) {
+   if (source == 0 || source->IsZombie()) {
       return kFALSE;
    }
 
@@ -240,16 +240,15 @@ Bool_t TFileMerger::AddFile(TFile *source, Bool_t own, Bool_t cpProgress)
          return kFALSE;
       }
       newfile = TFile::Open(localcopy, "READ");
+      // Zombie files should also be skipped
+      if (newfile && newfile->IsZombie()) {
+         delete newfile;
+         newfile = 0;
+      }
    } else {
       newfile = source;
    }
 
-   // Zombie files should also be skipped 
-   if (newfile && newfile->IsZombie()) {
-      delete newfile;
-      newfile = 0;
-   }
-
    if (!newfile) {
       if (fLocal)
          Error("AddFile", "cannot open local copy %s of URL %s",

proof/proof/src/TPackMgr.cxx

@@ -842,6 +842,7 @@ Int_t TPackMgr::Install(const char *parpath, Bool_t rmold)
    if (install) {
       if (!TFile::Cp(psrc, dest)) {
          Error("Install", "could not copy %s to %s", psrc.Data(), dest.Data());
+         if (md5) delete md5;
          return -1;
       }
    }

proof/proofd/src/proofexecv.cxx

@@ -639,9 +639,13 @@ int exportsock(rpdunix *conn)
    if (d == 0 || d == 1 || d == 2) {
       int fd = -1;
       int natt = 1000;
-      while (natt > 0 && (fd = dup(d)) <= 2) { natt--; }
+      while (natt > 0 && (fd = dup(d)) <= 2) {
+         if (fd != d) close(fd);
+         natt--;
+      }
       if (natt <= 0 && fd <= 2) {
          Info("exportsock: ERROR: no free filedescriptor!");
+         if (fd != d) close(fd);
          close(d);
          return -1;
       }

test/stressProof.cxx

@@ -1722,6 +1722,7 @@ Int_t PT_CheckSimple(TQueryResult *qr, Long64_t nevt, Int_t nhist)
       hist[i] = dynamic_cast<TH1F *>(TProof::GetOutput(Form("h%d",i), out));
       if (!hist[i]) {
          printf("\n >>> Test failure: 'h%d' histo not found\n", i);
+         delete[] hist;
          return -1;
       }
    }
@@ -1733,6 +1734,7 @@ Int_t PT_CheckSimple(TQueryResult *qr, Long64_t nevt, Int_t nhist)
       Double_t rms = hist[i]->GetRMS();
       if (TMath::Abs(ave) > 5 * rms / TMath::Sqrt(hist[i]->GetEntries())) {
          printf("\n >>> Test failure: 'h%d' histo: mean > 5 * RMS/Sqrt(N)\n", i);
+         delete[] hist;
          return -1;
       }
    }

tree/treeplayer/src/TSelectorDraw.cxx

@@ -377,6 +377,7 @@ void TSelectorDraw::Begin(TTree *tree)
             abrt.Form("An object of type '%s' has the same name as the requested histo (%s)", oldObject->IsA()->GetName(), hname);
             Abort(abrt);
             return;
+            delete[] varexp;
          }
          if (fOldHistogram && !hnameplus) fOldHistogram->Reset();  // reset unless adding is wanted
 
@@ -398,6 +399,7 @@ void TSelectorDraw::Begin(TTree *tree)
                abrt.Form("An object of type '%s' has the same name as the requested event list (%s)",
                          oldObject->IsA()->GetName(), hname);
                Abort(abrt);
+               delete[] varexp;
                return;
             }
             if (!enlist) {
@@ -447,7 +449,7 @@ void TSelectorDraw::Begin(TTree *tree)
                      // We have been asked to reset the input list!!
                      // Let's set it aside for now ...
                      Abort("Input and output lists are the same!");
-                     delete [] varexp;
+                     delete[] varexp;
                      return;
                   }
                   evlist->Reset();
@@ -477,17 +479,17 @@ void TSelectorDraw::Begin(TTree *tree)
    if (!CompileVariables(varexp, realSelection.GetTitle())) {
       abrt.Form("Variable compilation failed: {%s,%s}", varexp, realSelection.GetTitle());
       Abort(abrt);
-      delete [] varexp;
+      delete[] varexp;
       return;
    }
    if (fDimension > 4 && !(optpara || optcandle || opt5d || opt.Contains("goff"))) {
       Abort("Too many variables. Use the option \"para\", \"gl5d\" or \"candle\" to display more than 4 variables.");
-      delete [] varexp;
+      delete[] varexp;
       return;
    }
    if (fDimension < 2 && (optpara || optcandle)) {
       Abort("The options \"para\" and \"candle\" require at least 2 variables.");
-      delete [] varexp;
+      delete[] varexp;
       return;
    }
 
@@ -530,6 +532,7 @@ void TSelectorDraw::Begin(TTree *tree)
       gROOT->MakeDefCanvas();
       if (!gPad) {
          Abort("Creation of default canvas failed");
+         delete[] varexp;
          return;
       }
    }
@@ -889,8 +892,8 @@ void TSelectorDraw::Begin(TTree *tree)
       else if (opt5d) fAction = 8;
       else            fAction = 6;
    }
-   if (varexp) delete [] varexp;
-   if (hnamealloc) delete [] hnamealloc;
+   if (varexp) delete[] varexp;
+   if (hnamealloc) delete[] hnamealloc;
    for (i = 0; i < fValSize; ++i)
       fVarMultiple[i] = kFALSE;
    fSelectMultiple = kFALSE;