From 9ecbdb8cf2843cfbca650f13606f9d98216e9257 Mon Sep 17 00:00:00 2001
From: Bertrand Bellenot <Bertrand.Bellenot@cern.ch>
Date: Wed, 5 Oct 2011 13:34:30 +0000
Subject: [PATCH] Fix coverity reports (dereference null value)
git-svn-id: http://root.cern.ch/svn/root/trunk@41146 27541ba8-7e3a-0410-8455-c3a389f83636
---
gui/recorder/src/TRecorder.cxx | 51 ++++++++++++++++++----------------
1 file changed, 27 insertions(+), 24 deletions(-)
diff --git a/gui/recorder/src/TRecorder.cxx b/gui/recorder/src/TRecorder.cxx
index 7452cc80e2f..c703961bfd0 100644
--- a/gui/recorder/src/TRecorder.cxx
+++ b/gui/recorder/src/TRecorder.cxx
@@ -494,28 +494,28 @@ Bool_t TRecorderReplaying::Initialize(TRecorder *r, Bool_t showMouseCursor,
fFile->GetName());
TFile *f = TFile::Open(fFile->GetName());
- TIter nextkey(f->GetListOfKeys());
- TKey *key;
- TObject *obj;
- while ((key = (TKey*)nextkey())) {
- fFilterStatusBar = kTRUE;
- obj = key->ReadObj();
- if (!obj->InheritsFrom("TCanvas"))
- continue;
- fCanv = (TCanvas*) obj;
- fCanv->Draw();
- }
- TCanvas *canvas;
- TIter nextc(gROOT->GetListOfCanvases());
- while ((canvas = (TCanvas*)nextc())) {
- canvas->SetWindowSize(canvas->GetWindowWidth(),
- canvas->GetWindowHeight());
+ if (f && !f->IsZombie()) {
+ TIter nextkey(f->GetListOfKeys());
+ TKey *key;
+ TObject *obj;
+ while ((key = (TKey*)nextkey())) {
+ fFilterStatusBar = kTRUE;
+ obj = key->ReadObj();
+ if (!obj->InheritsFrom("TCanvas"))
+ continue;
+ fCanv = (TCanvas*) obj;
+ fCanv->Draw();
+ }
+ TCanvas *canvas;
+ TIter nextc(gROOT->GetListOfCanvases());
+ while ((canvas = (TCanvas*)nextc())) {
+ canvas->SetWindowSize(canvas->GetWindowWidth(),
+ canvas->GetWindowHeight());
+ }
+ fFilterStatusBar = kFALSE;
+ f->Close();
}
- fFilterStatusBar = kFALSE;
-
- f->Close();
-
gPad = 0;
// Starts replaying
fTimer->Connect("Timeout()","TRecorderReplaying",this,"ReplayRealtime()");
@@ -1028,11 +1028,11 @@ void TRecorderInactive::ListCmd(const char *filename)
}*/
TFile *file = TFile::Open(filename);
+ if (!file) return;
if (file->IsZombie() || !file->IsOpen()) {
delete file;
return;
}
-
TTree *t1 = (TTree*)file->Get(kCmdEventTree);
if (!t1) {
@@ -1071,11 +1071,11 @@ void TRecorderInactive::ListGui(const char *filename)
}*/
TFile *file = TFile::Open(filename);
+ if (!file) return;
if (file->IsZombie() || !file->IsOpen()) {
delete file;
return;
}
-
TTree *t1 = (TTree*)file->Get(kGuiEventTree);
if (!t1) {
@@ -1140,8 +1140,11 @@ void TRecorderInactive::PrevCanvases(const char *filename, Option_t *option)
fCollect = gROOT->GetListOfCanvases();
TFile *f = TFile::Open(filename, option);
- fCollect->Write();
- f->Close();
+ if (f && !f->IsZombie()) {
+ fCollect->Write();
+ f->Close();
+ delete f;
+ }
}
//______________________________________________________________________________
--
GitLab