← Back to branch summary

~ubuntu-branches/ubuntu/lucid/xorg-server/lucid 

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
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124

<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
<head>
<title>xorg/xserver - X server</title>
<meta name='generator' content='cgit v0.8.3.1'/>
<meta name='robots' content='index, nofollow'/>
<link rel='stylesheet' type='text/css' href='http://cgit.freedesktop.org/cgit.css'/>
<link rel='alternate' title='Atom feed' href='http://cgit.freedesktop.org/xorg/xserver/atom/?h=master' type='application/atom+xml'/>
</head>
<body>
<div id='cgit'><table id='header'>
<tr>
<td class='logo' rowspan='2'><a href='/'><img src='http://cgit.freedesktop.org/logo.png' alt='cgit logo'/></a></td>
<td class='main'><a href='/'>index</a> : <a title='xorg/xserver' href='/xorg/xserver/'>xorg/xserver</a></td><td class='form'><form method='get' action=''>
<input type='hidden' name='id' value='3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'/><select name='h' onchange='this.form.submit();'>
<option value='COMPOSITEWRAP'>COMPOSITEWRAP</option>
<option value='CYGWIN'>CYGWIN</option>
<option value='DAMAGE-XFIXES'>DAMAGE-XFIXES</option>
<option value='Domain-branch'>Domain-branch</option>
<option value='IPv6-REVIEW'>IPv6-REVIEW</option>
<option value='STSF-CURRENT'>STSF-CURRENT</option>
<option value='XACE-SELINUX'>XACE-SELINUX</option>
<option value='XACE-modular'>XACE-modular</option>
<option value='XEVIE'>XEVIE</option>
<option value='XINERAMA_2'>XINERAMA_2</option>
<option value='XORG-6_8-branch'>XORG-6_8-branch</option>
<option value='XORG-CURRENT'>XORG-CURRENT</option>
<option value='XORG-RELEASE-1'>XORG-RELEASE-1</option>
<option value='XORG-RELEASE-1-STSF'>XORG-RELEASE-1-STSF</option>
<option value='XORG-RELEASE-1-TM'>XORG-RELEASE-1-TM</option>
<option value='XORG-STABLE'>XORG-STABLE</option>
<option value='XPRINT'>XPRINT</option>
<option value='autoconfig-for-7.2'>autoconfig-for-7.2</option>
<option value='bcook-backend'>bcook-backend</option>
<option value='compat_output'>compat_output</option>
<option value='dmx-2'>dmx-2</option>
<option value='dri-0-1-branch'>dri-0-1-branch</option>
<option value='dri2-swapbuffers'>dri2-swapbuffers</option>
<option value='exa-damagetrack'>exa-damagetrack</option>
<option value='glucose-2'>glucose-2</option>
<option value='gsr-current'>gsr-current</option>
<option value='input-hotplug'>input-hotplug</option>
<option value='lg3d'>lg3d</option>
<option value='lg3d-7.2'>lg3d-7.2</option>
<option value='lg3d-dev'>lg3d-dev</option>
<option value='lg3d-dev-0-6-1'>lg3d-dev-0-6-1</option>
<option value='lg3d-dev-0-6-1-1'>lg3d-dev-0-6-1-1</option>
<option value='lg3d-dev-0-6-1-current'>lg3d-dev-0-6-1-current</option>
<option value='lg3d-dev-0-6-1-latest'>lg3d-dev-0-6-1-latest</option>
<option value='lg3d-dev-0-6-2'>lg3d-dev-0-6-2</option>
<option value='lg3d-dev-0-6-latest'>lg3d-dev-0-6-latest</option>
<option value='lg3d-dev-0-7-0'>lg3d-dev-0-7-0</option>
<option value='lg3d-dev-0-7-1'>lg3d-dev-0-7-1</option>
<option value='lg3d-event'>lg3d-event</option>
<option value='lg3d-master'>lg3d-master</option>
<option value='master' selected='selected'>master</option>
<option value='mpx'>mpx</option>
<option value='no-pci-rework'>no-pci-rework</option>
<option value='orib-soc-2006'>orib-soc-2006</option>
<option value='panning-for-server-1.6'>panning-for-server-1.6</option>
<option value='pci-rework'>pci-rework</option>
<option value='randr-1.2'>randr-1.2</option>
<option value='randr-1.2-for-server-1.2'>randr-1.2-for-server-1.2</option>
<option value='randr-dpms'>randr-dpms</option>
<option value='sco_port_update'>sco_port_update</option>
<option value='server-1.2-branch'>server-1.2-branch</option>
<option value='server-1.3-branch'>server-1.3-branch</option>
<option value='server-1.4-branch'>server-1.4-branch</option>
<option value='server-1.5-branch'>server-1.5-branch</option>
<option value='server-1.6-branch'>server-1.6-branch</option>
<option value='server-1.6-enterleave'>server-1.6-enterleave</option>
<option value='server-1.7-branch'>server-1.7-branch</option>
<option value='server-1.7-nominations'>server-1.7-nominations</option>
<option value='server-1.8-branch'>server-1.8-branch</option>
<option value='server-1_0-branch'>server-1_0-branch</option>
<option value='server-1_1-branch'>server-1_1-branch</option>
<option value='transform-proposal'>transform-proposal</option>
<option value='wonderland-dev'>wonderland-dev</option>
<option value='xf-4_0_2-branch'>xf-4_0_2-branch</option>
<option value='xf-4_1-branch'>xf-4_1-branch</option>
<option value='xf-4_2-branch'>xf-4_2-branch</option>
<option value='xf-4_3-branch'>xf-4_3-branch</option>
<option value='xfixes_2_branch'>xfixes_2_branch</option>
<option value='xgl-0-0-1'>xgl-0-0-1</option>
<option value='xorg-server-1.2-apple'>xorg-server-1.2-apple</option>
<option value='xorg-server-1.4-apple'>xorg-server-1.4-apple</option>
<option value='xorg-server-1.5-apple'>xorg-server-1.5-apple</option>
<option value='xorg-server-1.6-apple'>xorg-server-1.6-apple</option>
<option value='xorg-server-1.7-apple'>xorg-server-1.7-apple</option>
<option value='xquartz-composite'>xquartz-composite</option>
</select> <input type='submit' name='' value='switch'/></form></td></tr>
<tr><td class='sub'>X server</td><td class='sub right'>keithp</td></tr></table>
<table class='tabs'><tr><td>
<a href='/xorg/xserver/'>summary</a><a href='/xorg/xserver/refs/?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>refs</a><a href='/xorg/xserver/log/'>log</a><a href='/xorg/xserver/tree/?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>tree</a><a class='active' href='/xorg/xserver/commit/?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>commit</a><a href='/xorg/xserver/diff/?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>diff</a></td><td class='form'><form class='right' method='get' action='/xorg/xserver/log/'>
<input type='hidden' name='id' value='3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
</select>
<input class='txt' type='text' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='content'><table summary='commit info' class='commit-info'>
<tr><th>author</th><td>Michel Dänzer &lt;daenzer@vmware.com&gt;</td><td class='right'>2010-03-22 17:01:17 (GMT)</td></tr>
<tr><th>committer</th><td> Keith Packard &lt;keithp@keithp.com&gt;</td><td class='right'>2010-03-22 17:34:35 (GMT)</td></tr>
<tr><th>commit</th><td colspan='2' class='sha1'><a href='/xorg/xserver/commit/?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e</a> (<a href='/xorg/xserver/patch/?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>patch</a>)</td></tr>
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/xorg/xserver/tree/?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>f6014119615ec54ec6423f9c3c25a2587de4de6d</a></td></tr>
<tr><th>parent</th><td colspan='2' class='sha1'><a href='/xorg/xserver/commit/?id=b29220dc765cb6f878c5466e00e4bd21f3bd803d'>b29220dc765cb6f878c5466e00e4bd21f3bd803d</a> (<a href='/xorg/xserver/diff/?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e&amp;id2=b29220dc765cb6f878c5466e00e4bd21f3bd803d'>diff</a>)</td></tr><tr><th>download</th><td colspan='2' class='sha1'><a href='/xorg/xserver/snapshot/xserver-3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e.zip'>xserver-3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e.zip</a><br/><a href='/xorg/xserver/snapshot/xserver-3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e.tar.gz'>xserver-3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e.tar.gz</a><br/><a href='/xorg/xserver/snapshot/xserver-3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e.tar.bz2'>xserver-3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e.tar.bz2</a><br/></td></tr></table>
<div class='commit-subject'>Xext: Fix cursor reference counting hazard.</div><div class='commit-msg'>Make sure the reference count of the new cursor is increased before the old
one is decreased, otherwise bad things will happen if they're one and the
same and the reference count is 1 initially. Not sure this can actually happen
here, but better safe than sorry.

Signed-off-by: Michel Dänzer &lt;daenzer@vmware.com&gt;
Reviewed-by: Roland Scheidegger &lt;sroland@vmware.com&gt;
Signed-off-by: Keith Packard &lt;keithp@keithp.com&gt;
</div><div class='diffstat-header'><a href='/xorg/xserver/diff/?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>Diffstat</a></div><table summary='diffstat' class='diffstat'><tr><td class='mode'>-rw-r--r--</td><td class='upd'><a href='/xorg/xserver/diff/Xext/saver.c?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>Xext/saver.c</a></td><td class='right'>2</td><td class='graph'><table summary='file diffstat' width='2%'><tr><td class='add' style='width: 50.0%;'/><td class='rem' style='width: 50.0%;'/><td class='none' style='width: 0.0%;'/></tr></table></td></tr>
</table><div class='diffstat-summary'>1 files changed, 1 insertions, 1 deletions</div><table summary='diff' class='diff'><tr><td><div class='head'>diff --git a/Xext/saver.c b/Xext/saver.c<br/>index 2549e8a..aa2e614 100644<br/>--- a/<a href='/xorg/xserver/tree/Xext/saver.c?id=b29220dc765cb6f878c5466e00e4bd21f3bd803d'>Xext/saver.c</a><br/>+++ b/<a href='/xorg/xserver/tree/Xext/saver.c?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>Xext/saver.c</a></div><div class='hunk'>@@ -620,10 +620,10 @@ CreateSaverWindow (ScreenPtr pScreen)</div><div class='ctx'>     	    	FreeResource (pWin-&gt;drawable.id, RT_NONE);</div><div class='ctx'>     	    	return FALSE;</div><div class='ctx'> 	    }</div><div class='add'>+	pAttr-&gt;pCursor-&gt;refcnt++;</div><div class='ctx'> 	if (pWin-&gt;optional-&gt;cursor)</div><div class='ctx'> 	    FreeCursor (pWin-&gt;optional-&gt;cursor, (Cursor)0);</div><div class='ctx'> 	pWin-&gt;optional-&gt;cursor = pAttr-&gt;pCursor;</div><div class='del'>-	pAttr-&gt;pCursor-&gt;refcnt++;</div><div class='ctx'> 	pWin-&gt;cursorIsNone = FALSE;</div><div class='ctx'> 	CheckWindowOptionalNeed (pWin);</div><div class='ctx'> 	mask |= CWCursor;</div></td></tr></table></div> <!-- class=content -->
<div class='footer'>generated  by cgit v0.8.3.1 at 2010-04-15 01:46:13 (GMT)</div>
</div> <!-- id=cgit -->
</body>
</html>