From e4f323472a005c94b38377460613ecfc24fdefde Mon Sep 17 00:00:00 2001
From: Bertrand Bellenot <Bertrand.Bellenot@cern.ch>
Date: Thu, 6 Oct 2011 15:21:36 +0000
Subject: [PATCH] Fix coverity reports (dereference null return value)

git-svn-id: http://root.cern.ch/svn/root/trunk@41231 27541ba8-7e3a-0410-8455-c3a389f83636
---
 gui/gui/src/TRootCanvas.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gui/gui/src/TRootCanvas.cxx b/gui/gui/src/TRootCanvas.cxx
index e624554cb5b..c8fbc404ce6 100644
--- a/gui/gui/src/TRootCanvas.cxx
+++ b/gui/gui/src/TRootCanvas.cxx
@@ -957,7 +957,7 @@ again:
                         //   m->Update();
                         TColorWheel *wheel = new TColorWheel();
                         wheel->Draw();
-                        padsav->cd();
+                        if (padsav) padsav->cd();
                      }
                      break;
                   case kViewFonts:
@@ -1464,7 +1464,7 @@ void TRootCanvas::CreateEditor()
    Int_t show = gEnv->GetValue("Canvas.ShowEditor", 0);
    gEnv->SetValue("Canvas.ShowEditor","true");
    fEditor = TVirtualPadEditor::LoadEditor();
-   fEditor->SetGlobal(kFALSE);
+   if (fEditor) fEditor->SetGlobal(kFALSE);
    fEditorFrame->SetEditable(kEditDisable);
    fEditorFrame->SetEditable(kFALSE);
 
-- 
GitLab