Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
xorg
lib
libXft
Commits
8fc01234
Commit
8fc01234
authored
Jul 13, 2006
by
Kjartan Maraas
Committed by
Adam Jackson
Jul 13, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug #7259: Various Coverity fixes.
parent
824f87ba
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
4 deletions
+6
-4
src/xftcore.c
src/xftcore.c
+1
-1
src/xftdraw.c
src/xftdraw.c
+1
-1
src/xftrender.c
src/xftrender.c
+1
-1
src/xftxlfd.c
src/xftxlfd.c
+3
-1
No files found.
src/xftcore.c
View file @
8fc01234
...
...
@@ -921,7 +921,7 @@ _XftGlyphDefault (Display *dpy, XftFont *public)
if
(
XftFontCheckGlyph
(
dpy
,
public
,
FcTrue
,
0
,
missing
,
&
nmissing
))
glyphs_loaded
=
FcTrue
;
if
(
nmissing
)
XftFontLoadGlyphs
(
dpy
,
public
,
FcTrue
,
missing
,
nmissing
);
XftFontLoadGlyphs
(
dpy
,
public
,
glyphs_loaded
,
missing
,
nmissing
);
return
font
->
glyphs
[
0
];
}
...
...
src/xftdraw.c
View file @
8fc01234
...
...
@@ -210,7 +210,7 @@ _XftDrawFormat (XftDraw *draw)
{
XftDisplayInfo
*
info
=
_XftDisplayInfoGet
(
draw
->
dpy
,
True
);
if
(
!
info
->
hasRender
)
if
(
!
info
||
!
info
->
hasRender
)
return
0
;
if
(
draw
->
visual
==
0
)
...
...
src/xftrender.c
View file @
8fc01234
...
...
@@ -518,7 +518,7 @@ XftGlyphFontSpecRender (Display *dpy,
break
;
}
}
if
(
i
==
nglyphs
)
if
(
i
==
nglyphs
||
!
firstFont
)
goto
bail2
;
glyph
=
firstFont
->
glyphs
[
g
];
format
=
firstFont
->
format
;
...
...
src/xftxlfd.c
View file @
8fc01234
...
...
@@ -128,8 +128,10 @@ XftXlfdParse (const char *xlfd_orig, FcBool ignore_scalable, FcBool complete)
save
=
(
char
*
)
malloc
(
strlen
(
foundry
)
+
1
);
if
(
!
save
)
if
(
!
save
)
{
FcPatternDestroy
(
pat
);
return
0
;
}
if
(
!
FcPatternAddString
(
pat
,
XFT_XLFD
,
(
FcChar8
*
)
xlfd_orig
))
goto
bail
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment