xserver: Branch 'master'

[Keith Packard]

 hw/dmx/config/xdmxconfig.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 935ea0d7b5e18ad8f22ee074a08cbdc7390d0f5d
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Mon Apr 21 15:18:45 2014 -0700

    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 at oracle.com>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/dmx/config/xdmxconfig.c b/hw/dmx/config/xdmxconfig.c
index 2b7b968..0540d01 100644
--- a/hw/dmx/config/xdmxconfig.c
+++ b/hw/dmx/config/xdmxconfig.c
@@ -303,7 +303,6 @@ dmxConfigCanvasUpdate(void)
     fs = XQueryFont(dpy, gcontext);
     for (pt = dmxConfigCurrent->subentry; pt; pt = pt->next) {
         int x, y, len;
-        int xo = 3, yo = fs->ascent + fs->descent + 2;
         GC gc;
 
         if (pt->type != dmxConfigDisplay)
@@ -321,6 +320,8 @@ dmxConfigCanvasUpdate(void)
             y = dmxConfigWidgetHeight - 1;
         XDrawRectangle(dpy, win, gc, x, y, w, h);
         if (fs && len) {
+            int xo = 3, yo = fs->ascent + fs->descent + 2;
+
             while (len && XTextWidth(fs, pt->display->name, len) >= w - 2 * xo)
                 --len;
             if (len)