xserver: Branch 'master' - 4 commits

[Keith Packard]

 dix/dixfonts.c                 |    9 ++++++---
 dix/protocol.txt               |   11 +++++++++++
 hw/xfree86/common/xf86Helper.c |    7 ++++---
 hw/xfree86/vgahw/Makefile.am   |    1 +
 4 files changed, 22 insertions(+), 6 deletions(-)

New commits:
commit 435098a0dce6bca8870ec9725bf0af0969cd84fa
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 28 20:27:52 2014 -0800

    Add RANDR 1.4 requests & events to dix/protocol.txt
    
    Checked against randrproto.txt & randr.h
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/protocol.txt b/dix/protocol.txt
index 8e152ed..f83f38c 100644
--- a/dix/protocol.txt
+++ b/dix/protocol.txt
@@ -311,11 +311,22 @@ R028 RANDR:GetPanning
 R029 RANDR:SetPanning
 R030 RANDR:SetOutputPrimary
 R031 RANDR:GetOutputPrimary
+R032 RANDR:RRGetProviders
+R033 RANDR:RRGetProviderInfo
+R034 RANDR:RRSetProviderOffloadSink
+R035 RANDR:RRSetProviderOutputSource
+R036 RANDR:RRListProviderProperties
+R037 RANDR:RRQueryProviderProperty
+R038 RANDR:RRConfigureProviderProperty
+R039 RANDR:RRChangeProviderProperty
+R040 RANDR:RRDeleteProviderProperty
+R041 RANDR:RRGetProviderProperty
 V000 RANDR:ScreenChangeNotify
 V001 RANDR:Notify
 E000 RANDR:BadRROutput
 E001 RANDR:BadRRCrtc
 E002 RANDR:BadRRMode
+E003 RANDR:BadRRProvider
 R000 RECORD:QueryVersion
 R001 RECORD:CreateContext
 R002 RECORD:RegisterClients
commit c1ac89c793614797e08d3d8e7fc9ba55be899130
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 28 20:27:51 2014 -0800

    xf86DeleteScreen: move check for NULL pScrn before first dereference
    
    Flagged by cppcheck 1.62:
    [hw/xfree86/common/xf86Helper.c:220] -> [hw/xfree86/common/xf86Helper.c:231]:
     (warning) Possible null pointer dereference: pScrn - otherwise it is
     redundant to check it against null.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/common/xf86Helper.c b/hw/xfree86/common/xf86Helper.c
index 2c0629d..12a8771 100644
--- a/hw/xfree86/common/xf86Helper.c
+++ b/hw/xfree86/common/xf86Helper.c
@@ -217,6 +217,10 @@ xf86DeleteScreen(ScrnInfoPtr pScrn)
     int i;
     int scrnIndex;
     Bool is_gpu = FALSE;
+
+    if (!pScrn)
+        return;
+
     if (pScrn->is_gpu) {
         /* First check if the screen is valid */
         if (xf86NumGPUScreens == 0 || xf86GPUScreens == NULL)
@@ -228,9 +232,6 @@ xf86DeleteScreen(ScrnInfoPtr pScrn)
             return;
     }
 
-    if (!pScrn)
-        return;
-
     scrnIndex = pScrn->scrnIndex;
     /* If a FreeScreen function is defined, call it here */
     if (pScrn->FreeScreen != NULL)
commit e6733ae91b7be52930f22a87de15fa05819ef948
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 28 20:27:50 2014 -0800

    On realloc failure, free font_path_string instead of leaking it
    
    Flagged by cppcheck 1.62:
    [dix/dixfonts.c:1792]: (error) Common realloc mistake:
     'font_path_string' nulled but not freed upon failure
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/dix/dixfonts.c b/dix/dixfonts.c
index 341ca3f..83d2539 100644
--- a/dix/dixfonts.c
+++ b/dix/dixfonts.c
@@ -1792,11 +1792,14 @@ GetFontPath(ClientPtr client, int *count, int *length, unsigned char **result)
         fpe = font_path_elements[i];
         len += fpe->name_length + 1;
     }
-    font_path_string = (unsigned char *) realloc(font_path_string, len);
-    if (!font_path_string)
+    c = realloc(font_path_string, len);
+    if (c == NULL) {
+        free(font_path_string);
+        font_path_string = NULL;
         return BadAlloc;
+    }
 
-    c = font_path_string;
+    font_path_string = c;
     *length = 0;
     for (i = 0; i < num_fpes; i++) {
         fpe = font_path_elements[i];
commit 910b5b245425f0a866a703303b78768b0de5cb2b
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 28 20:27:49 2014 -0800

    Link libvgahw with $(PCIACCESS_LIBS) as well
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am
index f0b6574..4b718b4 100644
--- a/hw/xfree86/vgahw/Makefile.am
+++ b/hw/xfree86/vgahw/Makefile.am
@@ -1,5 +1,6 @@
 module_LTLIBRARIES = libvgahw.la
 libvgahw_la_LDFLAGS = -avoid-version
+libvgahw_la_LIBADD = $(PCIACCESS_LIBS)
 libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
 AM_CPPFLAGS = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
 AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)