| 1 |
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" |
diff --git a/os/xdmcp.c b/os/xdmcp.c |
|
"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 |
|
| 2 |
index b6e97c9..0e9e625 100644 |
index b6e97c9..0e9e625 100644 |
| 3 |
<span class="hl kwb">--- a/os/xdmcp.c</span> |
--- a/os/xdmcp.c |
| 4 |
<span class="hl kwa">+++ b/os/xdmcp.c</span> |
+++ b/os/xdmcp.c |
| 5 |
@@ -1409,8 +1409,16 @@ recv_alive_msg(unsigned length) |
@@ -1409,8 +1409,16 @@ recv_alive_msg(unsigned length) |
| 6 |
static void |
static void |
| 7 |
XdmcpFatal(const char *type, ARRAY8Ptr status) |
XdmcpFatal(const char *type, ARRAY8Ptr status) |
| 8 |
{ |
{ |
| 9 |
<span class="hl kwb">- FatalError("XDMCP fatal error: %s %*.*s\n", type,</span> |
- FatalError("XDMCP fatal error: %s %*.*s\n", type, |
| 10 |
<span class="hl kwb">- status->length, status->length, status->data);</span> |
- status->length, status->length, status->data); |
| 11 |
<span class="hl kwa">+ char *error_message;</span> |
+ char *error_message; |
| 12 |
<span class="hl kwa">+</span> |
+ |
| 13 |
<span class="hl kwa">+ /* error_message is leaked, but that's fine, we're aborting */</span> |
+ /* error_message is leaked, but that's fine, we're aborting */ |
| 14 |
<span class="hl kwa">+ error_message = malloc (status->length + 1);</span> |
+ error_message = malloc (status->length + 1); |
| 15 |
<span class="hl kwa">+ if (!error_message)</span> |
+ if (!error_message) |
| 16 |
<span class="hl kwa">+ FatalError("XDMCP fatal error: %s", type);</span> |
+ FatalError("XDMCP fatal error: %s", type); |
| 17 |
<span class="hl kwa">+</span> |
+ |
| 18 |
<span class="hl kwa">+ memcpy(error_message, status->data, status->length);</span> |
+ memcpy(error_message, status->data, status->length); |
| 19 |
<span class="hl kwa">+ error_message[status->length] = '\0';</span> |
+ error_message[status->length] = '\0'; |
| 20 |
<span class="hl kwa">+ FatalError("XDMCP fatal error: %s %s\n", type, error_message);</span> |
+ FatalError("XDMCP fatal error: %s %s\n", type, error_message); |
| 21 |
} |
} |
| 22 |
|
|
| 23 |
static void |
static void |
|
</code></pre></td></tr></table> |
|
|
</div> <!-- class=content --> |
|
|
<div class="foot" style="padding-left:1em;padding-right:1em;"> |
|
|
<p>Copyright © 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® 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> |
|
Parent Directory
| 
Revision Log
| 
Patch