xserver: Branch 'master'

[GitLab Mirror]

 hw/xfree86/drivers/modesetting/drmmode_display.c |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 43a0f9a5dbb469f4f403a8530f33be67618933b8
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Oct 1 11:42:37 2018 -0400

    modesetting: Don't free(dst) in drmmode_prop_info_copy
    
    The destination is always either on the stack or in the middle of some
    struct.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/hw/xfree86/drivers/modesetting/drmmode_display.c b/hw/xfree86/drivers/modesetting/drmmode_display.c
index f6f2e9fd1..9717d9d39 100644
--- a/hw/xfree86/drivers/modesetting/drmmode_display.c
+++ b/hw/xfree86/drivers/modesetting/drmmode_display.c
@@ -398,7 +398,6 @@ drmmode_prop_info_copy(drmmode_prop_info_ptr dst,
 err:
     while (i--)
         free(dst[i].enum_values);
-    free(dst);
     return FALSE;
 }