blob: b87d9768eacdfd814e3f4ab140251e5b9bf7f0a1 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
|
From 2ba68d05755b4dc8ec8b70733cfece032e01ce89 Mon Sep 17 00:00:00 2001
From: Martin Jansa <Martin.Jansa@gmail.com>
Date: Tue, 29 Jun 2010 13:26:59 +0200
Subject: [PATCH] xf86Modes: make sure that DisplayModeRec name is initialized to NULL and then don't call free() on it in xf86SetModeDefaultName
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
hw/xfree86/modes/xf86Modes.c | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/hw/xfree86/modes/xf86Modes.c b/hw/xfree86/modes/xf86Modes.c
index 05f4319..ccd2cc6 100644
--- a/hw/xfree86/modes/xf86Modes.c
+++ b/hw/xfree86/modes/xf86Modes.c
@@ -138,7 +138,8 @@ xf86SetModeDefaultName(DisplayModePtr mode)
{
Bool interlaced = !!(mode->Flags & V_INTERLACE);
- free(mode->name);
+ if (mode->name)
+ free(mode->name);
mode->name = XNFprintf("%dx%d%s", mode->HDisplay, mode->VDisplay,
interlaced ? "i" : "");
@@ -210,6 +211,7 @@ xf86DuplicateMode(const DisplayModeRec *pMode)
*pNew = *pMode;
pNew->next = NULL;
pNew->prev = NULL;
+ pNew->name = NULL;
if (pMode->name == NULL)
xf86SetModeDefaultName(pNew);
--
1.7.1
|
