From dcc9f51cbd4ed622cfb0f9b1c141eb2ffe3b12f1 Mon Sep 17 00:00:00 2001
From: Quanah Gibson-Mount <quanah@symas.com>
Date: Tue, 18 Feb 2020 19:05:12 +0000
Subject: [PATCH] Fix #587

Off by one error in common.c, CVE-2019-19906.

Thanks to Stephan Zeisberg for reporting
---
 lib/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/common.c b/lib/common.c
index bc3bf1df..9969d6aa 100644
--- a/lib/common.c
+++ b/lib/common.c
@@ -190,7 +190,7 @@ int _sasl_add_string(char **out, size_t *alloclen,
 
   if (add==NULL) add = "(null)";
 
-  addlen=strlen(add); /* only compute once */
+  addlen=strlen(add)+1; /* only compute once */
   if (_buf_alloc(out, alloclen, (*outlen)+addlen)!=SASL_OK)
     return SASL_NOMEM;
 
alue='koszko' selected='selected'>koszko</option>
<option value='koszko-scripts'>koszko-scripts</option>
</select> <input type='submit' value='switch'/></form></td></tr>
<tr><td class='sub'>Wojtek's customized Guix</td><td class='sub right'></td></tr></table>
<table class='tabs'><tr><td>
<a href='/guix/about/'>about</a><a href='/guix/'>summary</a><a href='/guix/refs/?id=9716914d4e4c1ba1cb99c3ed2b36b3cbf5ed14cd'>refs</a><a class='active' href='/guix/log/gnu/installer/substitutes.scm'>log</a><a href='/guix/tree/gnu/installer/substitutes.scm?id=9716914d4e4c1ba1cb99c3ed2b36b3cbf5ed14cd'>tree</a><a href='/guix/commit/gnu/installer/substitutes.scm?id=9716914d4e4c1ba1cb99c3ed2b36b3cbf5ed14cd'>commit</a><a href='/guix/diff/gnu/installer/substitutes.scm?id=9716914d4e4c1ba1cb99c3ed2b36b3cbf5ed14cd'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/substitutes.scm'>
<input type='hidden' name='id' value='9716914d4e4c1ba1cb99c3ed2b36b3cbf5ed14cd'/><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='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=9716914d4e4c1ba1cb99c3ed2b36b3cbf5ed14cd'>root</a>/<a href='/guix/log/gnu?id=9716914d4e4c1ba1cb99c3ed2b36b3cbf5ed14cd'>gnu</a>/<a href='/guix/log/gnu/installer?id=9716914d4e4c1ba1cb99c3ed2b36b3cbf5ed14cd'>installer</a>/<a href='/guix/log/gnu/installer/substitutes.scm?id=9716914d4e4c1ba1cb99c3ed2b36b3cbf5ed14cd'>substitutes.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/installer/substitutes.scm?id=9716914d4e4c1ba1cb99c3ed2b36b3cbf5ed14cd&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-12-11 21:37:07 +0100'>2020-12-11</span></td><td><a href='/guix/commit/gnu/installer/substitutes.scm?id=8361817bf693742757b096468198626f297bb09e'>install: Discover local substitute servers.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/installer/substitutes.scm: New file.
* gnu/installer/newt/substitutes.scm: New file.
* gnu/local.mk (INSTALLER_MODULES): Add them.
* po/guix/POTFILES.in: Add gnu/installer/newt/substitutes.scm.
* gnu/installer/proxy.scm (with-silent-shepherd): Move to ...
* gnu/installer/utils.scm: ... here.
* gnu/installer/record.scm (&lt;installer&gt;)[substitutes-page]: New field.
* gnu/installer/newt.scm (substitutes-page): New procedure,
(newt-installer): register it.
* gnu/installer.scm (installer-steps): Add "substitutes-page" step.
* gnu/system/install.scm (%installation-services): Add avahi-service-type and
enable substitute server discover in guix-service-type.
[&lt;name-service-switch&gt;]: Set it to %mdns-host-lookup-nss.
</span></span></td><td>Mathieu Othacehe</td></tr>