← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/patches/115_xext_fix_cursor_ref_counting.patch

  • Committer: Bazaar Package Importer
  • Author(s): Bryce Harrington
  • Date: 2010-04-14 18:49:56 UTC
  • Revision ID: james.westby@ubuntu.com-20100414184956-fv68fe6gr97o4bq5
Tags: 2:1.7.6-2ubuntu4
* Add several cherrypicks of fixes from upstream git tree which fix various
  issues and that look safe with low or no risk of regression.
  + 115_xext_fix_cursor_ref_counting.patch: Xext: Fix cursor reference
    counting hazard.
  + 116_fix_typos_in_swap_functions.patch: Fixes typos in several of the
    glxcmdsswap routines.
  + 117_fix_crash_with_createglyphset.patch:  Fixes crash introduced in
    FindGlyphsByHash() if one client disconnects while a second is in
    the middle of doing certain Glyph operations.
  + 118_xkb_fix_garbage_init.patch: Fixes typo that can cause garbage
    bits to get appended on the xkbControlsNotify changedControls mask
    because it was uninitialized on the stack.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/115_xext_fix_cursor_ref_counting.patch
 
1
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
 
2
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
3
<html xmlns='http://www.w3.org/1999/xhtml' xml:lang='en' lang='en'>
 
4
<head>
 
5
<title>xorg/xserver - X server</title>
 
6
<meta name='generator' content='cgit v0.8.3.1'/>
 
7
<meta name='robots' content='index, nofollow'/>
 
8
<link rel='stylesheet' type='text/css' href='http://cgit.freedesktop.org/cgit.css'/>
 
9
<link rel='alternate' title='Atom feed' href='http://cgit.freedesktop.org/xorg/xserver/atom/?h=master' type='application/atom+xml'/>
 
10
</head>
 
11
<body>
 
12
<div id='cgit'><table id='header'>
 
13
<tr>
 
14
<td class='logo' rowspan='2'><a href='/'><img src='http://cgit.freedesktop.org/logo.png' alt='cgit logo'/></a></td>
 
15
<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=''>
 
16
<input type='hidden' name='id' value='3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'/><select name='h' onchange='this.form.submit();'>
 
17
<option value='COMPOSITEWRAP'>COMPOSITEWRAP</option>
 
18
<option value='CYGWIN'>CYGWIN</option>
 
19
<option value='DAMAGE-XFIXES'>DAMAGE-XFIXES</option>
 
20
<option value='Domain-branch'>Domain-branch</option>
 
21
<option value='IPv6-REVIEW'>IPv6-REVIEW</option>
 
22
<option value='STSF-CURRENT'>STSF-CURRENT</option>
 
23
<option value='XACE-SELINUX'>XACE-SELINUX</option>
 
24
<option value='XACE-modular'>XACE-modular</option>
 
25
<option value='XEVIE'>XEVIE</option>
 
26
<option value='XINERAMA_2'>XINERAMA_2</option>
 
27
<option value='XORG-6_8-branch'>XORG-6_8-branch</option>
 
28
<option value='XORG-CURRENT'>XORG-CURRENT</option>
 
29
<option value='XORG-RELEASE-1'>XORG-RELEASE-1</option>
 
30
<option value='XORG-RELEASE-1-STSF'>XORG-RELEASE-1-STSF</option>
 
31
<option value='XORG-RELEASE-1-TM'>XORG-RELEASE-1-TM</option>
 
32
<option value='XORG-STABLE'>XORG-STABLE</option>
 
33
<option value='XPRINT'>XPRINT</option>
 
34
<option value='autoconfig-for-7.2'>autoconfig-for-7.2</option>
 
35
<option value='bcook-backend'>bcook-backend</option>
 
36
<option value='compat_output'>compat_output</option>
 
37
<option value='dmx-2'>dmx-2</option>
 
38
<option value='dri-0-1-branch'>dri-0-1-branch</option>
 
39
<option value='dri2-swapbuffers'>dri2-swapbuffers</option>
 
40
<option value='exa-damagetrack'>exa-damagetrack</option>
 
41
<option value='glucose-2'>glucose-2</option>
 
42
<option value='gsr-current'>gsr-current</option>
 
43
<option value='input-hotplug'>input-hotplug</option>
 
44
<option value='lg3d'>lg3d</option>
 
45
<option value='lg3d-7.2'>lg3d-7.2</option>
 
46
<option value='lg3d-dev'>lg3d-dev</option>
 
47
<option value='lg3d-dev-0-6-1'>lg3d-dev-0-6-1</option>
 
48
<option value='lg3d-dev-0-6-1-1'>lg3d-dev-0-6-1-1</option>
 
49
<option value='lg3d-dev-0-6-1-current'>lg3d-dev-0-6-1-current</option>
 
50
<option value='lg3d-dev-0-6-1-latest'>lg3d-dev-0-6-1-latest</option>
 
51
<option value='lg3d-dev-0-6-2'>lg3d-dev-0-6-2</option>
 
52
<option value='lg3d-dev-0-6-latest'>lg3d-dev-0-6-latest</option>
 
53
<option value='lg3d-dev-0-7-0'>lg3d-dev-0-7-0</option>
 
54
<option value='lg3d-dev-0-7-1'>lg3d-dev-0-7-1</option>
 
55
<option value='lg3d-event'>lg3d-event</option>
 
56
<option value='lg3d-master'>lg3d-master</option>
 
57
<option value='master' selected='selected'>master</option>
 
58
<option value='mpx'>mpx</option>
 
59
<option value='no-pci-rework'>no-pci-rework</option>
 
60
<option value='orib-soc-2006'>orib-soc-2006</option>
 
61
<option value='panning-for-server-1.6'>panning-for-server-1.6</option>
 
62
<option value='pci-rework'>pci-rework</option>
 
63
<option value='randr-1.2'>randr-1.2</option>
 
64
<option value='randr-1.2-for-server-1.2'>randr-1.2-for-server-1.2</option>
 
65
<option value='randr-dpms'>randr-dpms</option>
 
66
<option value='sco_port_update'>sco_port_update</option>
 
67
<option value='server-1.2-branch'>server-1.2-branch</option>
 
68
<option value='server-1.3-branch'>server-1.3-branch</option>
 
69
<option value='server-1.4-branch'>server-1.4-branch</option>
 
70
<option value='server-1.5-branch'>server-1.5-branch</option>
 
71
<option value='server-1.6-branch'>server-1.6-branch</option>
 
72
<option value='server-1.6-enterleave'>server-1.6-enterleave</option>
 
73
<option value='server-1.7-branch'>server-1.7-branch</option>
 
74
<option value='server-1.7-nominations'>server-1.7-nominations</option>
 
75
<option value='server-1.8-branch'>server-1.8-branch</option>
 
76
<option value='server-1_0-branch'>server-1_0-branch</option>
 
77
<option value='server-1_1-branch'>server-1_1-branch</option>
 
78
<option value='transform-proposal'>transform-proposal</option>
 
79
<option value='wonderland-dev'>wonderland-dev</option>
 
80
<option value='xf-4_0_2-branch'>xf-4_0_2-branch</option>
 
81
<option value='xf-4_1-branch'>xf-4_1-branch</option>
 
82
<option value='xf-4_2-branch'>xf-4_2-branch</option>
 
83
<option value='xf-4_3-branch'>xf-4_3-branch</option>
 
84
<option value='xfixes_2_branch'>xfixes_2_branch</option>
 
85
<option value='xgl-0-0-1'>xgl-0-0-1</option>
 
86
<option value='xorg-server-1.2-apple'>xorg-server-1.2-apple</option>
 
87
<option value='xorg-server-1.4-apple'>xorg-server-1.4-apple</option>
 
88
<option value='xorg-server-1.5-apple'>xorg-server-1.5-apple</option>
 
89
<option value='xorg-server-1.6-apple'>xorg-server-1.6-apple</option>
 
90
<option value='xorg-server-1.7-apple'>xorg-server-1.7-apple</option>
 
91
<option value='xquartz-composite'>xquartz-composite</option>
 
92
</select> <input type='submit' name='' value='switch'/></form></td></tr>
 
93
<tr><td class='sub'>X server</td><td class='sub right'>keithp</td></tr></table>
 
94
<table class='tabs'><tr><td>
 
95
<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/'>
 
96
<input type='hidden' name='id' value='3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'/><select name='qt'>
 
97
<option value='grep'>log msg</option>
 
98
<option value='author'>author</option>
 
99
<option value='committer'>committer</option>
 
100
</select>
 
101
<input class='txt' type='text' size='10' name='q' value=''/>
 
102
<input type='submit' value='search'/>
 
103
</form>
 
104
</td></tr></table>
 
105
<div class='content'><table summary='commit info' class='commit-info'>
 
106
<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>
 
107
<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>
 
108
<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>
 
109
<tr><th>tree</th><td colspan='2' class='sha1'><a href='/xorg/xserver/tree/?id=3083c5d0c4386cdd7083b7a83ac72fdad2f1e61e'>f6014119615ec54ec6423f9c3c25a2587de4de6d</a></td></tr>
 
110
<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>
 
111
<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
 
112
one is decreased, otherwise bad things will happen if they're one and the
 
113
same and the reference count is 1 initially. Not sure this can actually happen
 
114
here, but better safe than sorry.
 
115
 
 
116
Signed-off-by: Michel Dänzer &lt;daenzer@vmware.com&gt;
 
117
Reviewed-by: Roland Scheidegger &lt;sroland@vmware.com&gt;
 
118
Signed-off-by: Keith Packard &lt;keithp@keithp.com&gt;
 
119
</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>
 
120
</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 -->
 
121
<div class='footer'>generated  by cgit v0.8.3.1 at 2010-04-15 01:46:13 (GMT)</div>
 
122
</div> <!-- id=cgit -->
 
123
</body>
 
124
</html>