frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dmxConfigCanvasUpdate: Delay dereference until after checking for NULL 

Flagged by cppcheck 1.64:
[hw/dmx/config/xdmxconfig.c:306] -> [hw/dmx/config/xdmxconfig.c:323]:
 (warning) Possible null pointer dereference: fs - otherwise
           it is redundant to check it against null.

Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Alan Coopersmith 2014-04-21 15:18:45 -07:00 committed by Keith Packard
parent 983e30361f
commit 935ea0d7b5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hw/dmx/config/xdmxconfig.c
View File

@ -303,7 +303,6 @@ dmxConfigCanvasUpdate(void)
fs = XQueryFont(dpy, gcontext); fs = XQueryFont(dpy, gcontext);
for (pt = dmxConfigCurrent->subentry; pt; pt = pt->next) { for (pt = dmxConfigCurrent->subentry; pt; pt = pt->next) {
int x, y, len; int x, y, len;
int xo = 3, yo = fs->ascent + fs->descent + 2;
GC gc; GC gc;
if (pt->type != dmxConfigDisplay) if (pt->type != dmxConfigDisplay)
@ -321,6 +320,8 @@ dmxConfigCanvasUpdate(void)
y = dmxConfigWidgetHeight - 1; y = dmxConfigWidgetHeight - 1;
XDrawRectangle(dpy, win, gc, x, y, w, h); XDrawRectangle(dpy, win, gc, x, y, w, h);
if (fs && len) { if (fs && len) {
int xo = 3, yo = fs->ascent + fs->descent + 2;
while (len && XTextWidth(fs, pt->display->name, len) >= w - 2 * xo) while (len && XTextWidth(fs, pt->display->name, len) >= w - 2 * xo)
--len; --len;
if (len) if (len)