xserver: Branch 'master'

[Keith Packard]

 hw/xfree86/ddc/ddc.c |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 7e0575baf14ec4a89492fd2780f9ab5b9244afbd
Author: Matt Turner <mattst88 at gmail.com>
Date:   Tue Jul 27 23:32:36 2010 -0400

    ddc: Fix memory leak in GetEDID_DDC1
    
    Mark argument to DDC_checksum as const too.
    
    Signed-off-by: Matt Turner <mattst88 at gmail.com>
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Keith Packard <keithp at keithp.com>

diff --git a/hw/xfree86/ddc/ddc.c b/hw/xfree86/ddc/ddc.c
index 7379e95..2d9d4dc 100644
--- a/hw/xfree86/ddc/ddc.c
+++ b/hw/xfree86/ddc/ddc.c
@@ -102,7 +102,7 @@ resort(unsigned char *s_block)
 }
 
 static int
-DDC_checksum(unsigned char *block, int len)
+DDC_checksum(const unsigned char *block, int len)
 {
     int i, result = 0;
     int not_null = 0;
@@ -149,7 +149,10 @@ GetEDID_DDC1(unsigned int *s_ptr)
 	d_pos++;
     }
     free(s_ptr);
-    if (d_block && DDC_checksum(d_block,EDID1_LEN)) return NULL;
+    if (d_block && DDC_checksum(d_block,EDID1_LEN)) {
+	free(d_block);
+	return NULL;
+    }
     return (resort(d_block));
 }