xorg-server/patches/xorg-server-1.17.1-v2-xserver-fix-a-crash-with-xdmcp-error-handler.patch

<!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>svntogit/packages.git - Git clone of the 'packages' repository
</title>
<meta name='generator' content='cgit v0.10.2'/>
<meta name='robots' content='index, nofollow'/>
<link rel='stylesheet' type='text/css' href='/cgit.css'/>
<link rel='shortcut icon' href='/favicon.ico'/>
<link rel='alternate' title='Atom feed' href='https://projects.archlinux.org/svntogit/packages.git/atom/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server' type='application/atom+xml'/>
<link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
<link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
<link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
<link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
</head>
<body>
	<div id="archnavbar"><!-- Arch Linux global navigation bar -->
		<div id="archnavbarlogo">
			<p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>
		</div>
		<div id="archnavbarmenu">
			<ul id="archnavbarlist">
				<li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>
				<li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>
				<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
				<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
				<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>
				<li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
				<li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>
			</ul>
		</div>
	</div><!-- #archnavbar -->
<div id='cgit'><table id='header'>
<tr>
<td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>
<tr><td class='sub'>Git clone of the 'packages' repository
</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/svntogit/packages.git/?h=packages/xorg-server'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/xorg-server'>refs</a><a href='/svntogit/packages.git/log/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>tree</a><a href='/svntogit/packages.git/commit/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>commit</a><a href='/svntogit/packages.git/diff/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>diff</a><a href='/svntogit/packages.git/stats/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch'>
<input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='text' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/xorg-server'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/xorg-server'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch</a></div><div class='content'>blob: 02dbaf22f93f7b1f914eedffff113aa3702d63c3 (<a href='/svntogit/packages.git/plain/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>plain</a>)
<table summary='blob content' class='blob'>
<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
<a id='n2' href='#n2'>2</a>
<a id='n3' href='#n3'>3</a>
<a id='n4' href='#n4'>4</a>
<a id='n5' href='#n5'>5</a>
<a id='n6' href='#n6'>6</a>
<a id='n7' href='#n7'>7</a>
<a id='n8' href='#n8'>8</a>
<a id='n9' href='#n9'>9</a>
<a id='n10' href='#n10'>10</a>
<a id='n11' href='#n11'>11</a>
<a id='n12' href='#n12'>12</a>
<a id='n13' href='#n13'>13</a>
<a id='n14' href='#n14'>14</a>
<a id='n15' href='#n15'>15</a>
<a id='n16' href='#n16'>16</a>
<a id='n17' href='#n17'>17</a>
<a id='n18' href='#n18'>18</a>
<a id='n19' href='#n19'>19</a>
<a id='n20' href='#n20'>20</a>
<a id='n21' href='#n21'>21</a>
<a id='n22' href='#n22'>22</a>
<a id='n23' href='#n23'>23</a>
</pre></td>
<td class='lines'><pre><code>diff --git a/os/xdmcp.c b/os/xdmcp.c
index b6e97c9..0e9e625 100644
<span class="hl kwb">--- a/os/xdmcp.c</span>
<span class="hl kwa">+++ b/os/xdmcp.c</span>
&#64;&#64; -1409,8 +1409,16 &#64;&#64; recv_alive_msg(unsigned length)
 static void
 XdmcpFatal(const char *type, ARRAY8Ptr status)
 {
<span class="hl kwb">-    FatalError(&quot;XDMCP fatal error: %s %*.*s\n&quot;, type,</span>
<span class="hl kwb">-               status-&gt;length, status-&gt;length, status-&gt;data);</span>
<span class="hl kwa">+    char *error_message;</span>
<span class="hl kwa">+</span>
<span class="hl kwa">+    /* error_message is leaked, but that's fine, we're aborting */</span>
<span class="hl kwa">+    error_message = malloc (status-&gt;length + 1);</span>
<span class="hl kwa">+    if (!error_message)</span>
<span class="hl kwa">+        FatalError(&quot;XDMCP fatal error: %s&quot;, type);</span>
<span class="hl kwa">+</span>
<span class="hl kwa">+    memcpy(error_message, status-&gt;data, status-&gt;length);</span>
<span class="hl kwa">+    error_message[status-&gt;length] = '\0';</span>
<span class="hl kwa">+    FatalError(&quot;XDMCP fatal error: %s %s\n&quot;, type, error_message);</span>
 }
 
 static void
</code></pre></td></tr></table>
</div> <!-- class=content -->
<div class="foot" style="padding-left:1em;padding-right:1em;">
<p>Copyright &copy; 2002-2014 <a href="mailto:jvinet@zeroflux.org"
title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"
title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo
are recognized trademarks. Some rights reserved. The registered trademark
Linux&reg; is used pursuant to a sublicense from LMI, the exclusive licensee
of Linus Torvalds, owner of the mark on a world-wide basis.</p>
</div>
</div> <!-- id=cgit -->
</body>
</html>
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>svntogit/packages.git - Git clone of the 'packages' repository
6	</title>
7	<meta name='generator' content='cgit v0.10.2'/>
8	<meta name='robots' content='index, nofollow'/>
9	<link rel='stylesheet' type='text/css' href='/cgit.css'/>
10	<link rel='shortcut icon' href='/favicon.ico'/>
11	<link rel='alternate' title='Atom feed' href='https://projects.archlinux.org/svntogit/packages.git/atom/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server' type='application/atom+xml'/>
12	<link rel='vcs-git' href='git://projects.archlinux.org/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
13	<link rel='vcs-git' href='http://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
14	<link rel='vcs-git' href='https://projects.archlinux.org/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
15	<link rel='vcs-git' href='ssh://gerolde.archlinux.org/srv/projects/git/svntogit/packages.git' title='svntogit/packages.git Git repository'/>
16	</head>
17	<body>
18	<div id="archnavbar"><!-- Arch Linux global navigation bar -->
19	<div id="archnavbarlogo">
20	<p><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more"></a></p>
21	</div>
22	<div id="archnavbarmenu">
23	<ul id="archnavbarlist">
24	<li id="anb-home"><a href="http://www.archlinux.org/" title="Arch news, packages, projects and more">Home</a></li>
25	<li id="anb-packages"><a href="http://www.archlinux.org/packages/" title="Arch Package Database">Packages</a></li>
26	<li id="anb-forums"><a href="https://bbs.archlinux.org/" title="Community forums">Forums</a></li>
27	<li id="anb-wiki"><a href="https://wiki.archlinux.org/" title="Community documentation">Wiki</a></li>
28	<li id="anb-bugs"><a href="https://bugs.archlinux.org/" title="Report and follow bugs">Bugs</a></li>
29	<li id="anb-aur"><a href="https://aur.archlinux.org/" title="Arch Linux User Repository">AUR</a></li>
30	<li id="anb-download"><a href="http://www.archlinux.org/download/" title="Get Arch Linux">Download</a></li>
31	</ul>
32	</div>
33	</div><!-- #archnavbar -->
34	<div id='cgit'><table id='header'>
35	<tr>
36	<td class='main'><a href='/'>index</a> : <a title='svntogit/packages.git' href='/svntogit/packages.git/'>svntogit/packages.git</a></td></tr>
37	<tr><td class='sub'>Git clone of the 'packages' repository
38	</td><td class='sub right'></td></tr></table>
39	<table class='tabs'><tr><td>
40	<a href='/svntogit/packages.git/?h=packages/xorg-server'>summary</a><a href='/svntogit/packages.git/refs/?h=packages/xorg-server'>refs</a><a href='/svntogit/packages.git/log/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>log</a><a class='active' href='/svntogit/packages.git/tree/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>tree</a><a href='/svntogit/packages.git/commit/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>commit</a><a href='/svntogit/packages.git/diff/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>diff</a><a href='/svntogit/packages.git/stats/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>stats</a></td><td class='form'><form class='right' method='get' action='/svntogit/packages.git/log/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch'>
41	<input type='hidden' name='h' value='packages/xorg-server'/><select name='qt'>
42	<option value='grep'>log msg</option>
43	<option value='author'>author</option>
44	<option value='committer'>committer</option>
45	<option value='range'>range</option>
46	</select>
47	<input class='txt' type='text' size='10' name='q' value=''/>
48	<input type='submit' value='search'/>
49	</form>
50	</td></tr></table>
51	<div class='path'>path: <a href='/svntogit/packages.git/tree/?h=packages/xorg-server'>root</a>/<a href='/svntogit/packages.git/tree/trunk?h=packages/xorg-server'>trunk</a>/<a href='/svntogit/packages.git/tree/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch</a></div><div class='content'>blob: 02dbaf22f93f7b1f914eedffff113aa3702d63c3 (<a href='/svntogit/packages.git/plain/trunk/v2-xserver-Fix-a-crash-with-XDMCP-error-handler.patch?h=packages/xorg-server'>plain</a>)
52	<table summary='blob content' class='blob'>
53	<tr><td class='linenumbers'><pre><a id='n1' href='#n1'>1</a>
54	<a id='n2' href='#n2'>2</a>
55	<a id='n3' href='#n3'>3</a>
56	<a id='n4' href='#n4'>4</a>
57	<a id='n5' href='#n5'>5</a>
58	<a id='n6' href='#n6'>6</a>
59	<a id='n7' href='#n7'>7</a>
60	<a id='n8' href='#n8'>8</a>
61	<a id='n9' href='#n9'>9</a>
62	<a id='n10' href='#n10'>10</a>
63	<a id='n11' href='#n11'>11</a>
64	<a id='n12' href='#n12'>12</a>
65	<a id='n13' href='#n13'>13</a>
66	<a id='n14' href='#n14'>14</a>
67	<a id='n15' href='#n15'>15</a>
68	<a id='n16' href='#n16'>16</a>
69	<a id='n17' href='#n17'>17</a>
70	<a id='n18' href='#n18'>18</a>
71	<a id='n19' href='#n19'>19</a>
72	<a id='n20' href='#n20'>20</a>
73	<a id='n21' href='#n21'>21</a>
74	<a id='n22' href='#n22'>22</a>
75	<a id='n23' href='#n23'>23</a>
76	</pre></td>
77	<td class='lines'><pre><code>diff --git a/os/xdmcp.c b/os/xdmcp.c
78	index b6e97c9..0e9e625 100644
79	<span class="hl kwb">--- a/os/xdmcp.c</span>
80	<span class="hl kwa">+++ b/os/xdmcp.c</span>
81	@@ -1409,8 +1409,16 @@ recv_alive_msg(unsigned length)
82	static void
83	XdmcpFatal(const char *type, ARRAY8Ptr status)
84	{
85	<span class="hl kwb">- FatalError("XDMCP fatal error: %s %.s\n", type,</span>
86	<span class="hl kwb">- status->length, status->length, status->data);</span>
87	<span class="hl kwa">+ char *error_message;</span>
88	<span class="hl kwa">+</span>
89	<span class="hl kwa">+ /* error_message is leaked, but that's fine, we're aborting */</span>
90	<span class="hl kwa">+ error_message = malloc (status->length + 1);</span>
91	<span class="hl kwa">+ if (!error_message)</span>
92	<span class="hl kwa">+ FatalError("XDMCP fatal error: %s", type);</span>
93	<span class="hl kwa">+</span>
94	<span class="hl kwa">+ memcpy(error_message, status->data, status->length);</span>
95	<span class="hl kwa">+ error_message[status->length] = '\0';</span>
96	<span class="hl kwa">+ FatalError("XDMCP fatal error: %s %s\n", type, error_message);</span>
97	}
98
99	static void
100	</code></pre></td></tr></table>
101	</div> <!-- class=content -->
102	<div class="foot" style="padding-left:1em;padding-right:1em;">
103	<p>Copyright © 2002-2014 <a href="mailto:jvinet@zeroflux.org"
104	title="contact Judd Vinet">Judd Vinet</a> and <a href="mailto:aaron@archlinux.org"
105	title="contact Aaron Griffin">Aaron Griffin</a>. The Arch Linux name and logo
106	are recognized trademarks. Some rights reserved. The registered trademark
107	Linux® is used pursuant to a sublicense from LMI, the exclusive licensee
108	of Linus Torvalds, owner of the mark on a world-wide basis.</p>
109	</div>
110	</div> <!-- id=cgit -->
111	</body>
112	</html>