xf86-video-ati: Branch 'master'

[Alex Deucher]

 src/radeon_output.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9b8605d4e2bf7703c7848f3e2022a8c7328a3acd
Author: Alex Deucher <alexdeucher at gmail.com>
Date:   Tue Nov 17 11:45:09 2009 -0500

    radeon: fix potential memory leak in ddc code
    
    Signed-off-by: Alex Deucher <alexdeucher at gmail.com>

diff --git a/src/radeon_output.c b/src/radeon_output.c
index 9d9a16c..42d37fa 100644
--- a/src/radeon_output.c
+++ b/src/radeon_output.c
@@ -356,9 +356,11 @@ radeon_ddc_connected(xf86OutputPtr output)
 	    break;
 	}
 
-	if (MonType != MT_NONE)
+	if (MonType != MT_NONE) {
 	    if (!xf86ReturnOptValBool(info->Options, OPTION_IGNORE_EDID, FALSE))
 		xf86OutputSetEDID(output, MonInfo);
+	} else
+	    xfree(MonInfo);
     } else
 	MonType = MT_NONE;