From c8f7e1a88b081ac968407a9e5664222ff7347ef9 Mon Sep 17 00:00:00 2001
From: Olivier Couet <Olivier.Couet@cern.ch>
Date: Wed, 18 Jan 2012 15:51:35 +0000
Subject: [PATCH] - Fix coverity reports RETURNS_NULL
git-svn-id: http://root.cern.ch/svn/root/trunk@42707 27541ba8-7e3a-0410-8455-c3a389f83636
---
graf2d/x11/src/TGX11.cxx | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/graf2d/x11/src/TGX11.cxx b/graf2d/x11/src/TGX11.cxx
index 81c7a4ac8c6..703b80e1dfc 100644
--- a/graf2d/x11/src/TGX11.cxx
+++ b/graf2d/x11/src/TGX11.cxx
@@ -1105,7 +1105,7 @@ Int_t TGX11::OpenDisplay(Display *disp)
strcpy(gFont[i].name, " ");
}
fontlist = XListFonts(fDisplay, "*courier*", 1, &fontcount);
- if (fontcount != 0) {
+ if (fontlist && fontcount != 0) {
gFont[gCurrentFontNumber].id = XLoadQueryFont(fDisplay, fontlist[0]);
gTextFont = gFont[gCurrentFontNumber].id;
strcpy(gFont[gCurrentFontNumber].name, "*courier*");
@@ -1114,7 +1114,7 @@ Int_t TGX11::OpenDisplay(Display *disp)
} else {
// emergency: try fixed font
fontlist = XListFonts(fDisplay, "fixed", 1, &fontcount);
- if (fontcount != 0) {
+ if (fontlist && fontcount != 0) {
gFont[gCurrentFontNumber].id = XLoadQueryFont(fDisplay, fontlist[0]);
gTextFont = gFont[gCurrentFontNumber].id;
strcpy(gFont[gCurrentFontNumber].name, "fixed");
@@ -2852,9 +2852,8 @@ Int_t TGX11::SetTextFont(char *fontname, ETextSetMode mode)
}
fontlist = XListFonts(fDisplay, fontname, 1, &fontcount);
- if (!fontlist) return 1;
- if (fontcount != 0) {
+ if (fontlist && fontcount != 0) {
if (mode == kLoad) {
if (gFont[gCurrentFontNumber].id)
XFreeFont(fDisplay, gFont[gCurrentFontNumber].id);
--
GitLab