From a8769ef12d7e223e33fc47bed03fba2bfa2f3536 Mon Sep 17 00:00:00 2001
From: Marcus Sundberg <marcus@marcussundberg.com>
Date: Sat, 26 Mar 2016 20:11:43 +0100
Subject: [PATCH] evbuffer_add: Use last_with_datap if set, not last.

evbuffer_add() would always put data in the last chain, even if there
was available space in a previous chain, and in doing so it also
failed to update last_with_datap, causing subsequent calls to other
functions that do look at last_with_datap to add data in the middle
of the evbuffer instead of at the end.

Fixes the evbuffer_add() part of issue #335, and the evbuffer/add2 and
evbuffer/add3 tests, and also prevents wasting space available in the
chain pointed to by last_with_datap.
---
 buffer.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/buffer.c b/buffer.c
index 7cca0e8a..f378b731 100644
--- a/buffer.c
+++ b/buffer.c
@@ -1732,7 +1732,11 @@ evbuffer_add(struct evbuffer *buf, const void *data_in, size_t datlen)
 		goto done;
 	}
 
-	chain = buf->last;
+	if (*buf->last_with_datap == NULL) {
+		chain = buf->last;
+	} else {
+		chain = *buf->last_with_datap;
+	}
 
 	/* If there are no chains allocated for this buffer, allocate one
 	 * big enough to hold all the data. */
-- 
2.12.0

m?id=6098a386a90f63fc8c6f18c5edfce15320789941'>tree</a><a href='/guix/commit/gnu/packages/datastructures.scm?id=6098a386a90f63fc8c6f18c5edfce15320789941'>commit</a><a href='/guix/diff/gnu/packages/datastructures.scm?id=6098a386a90f63fc8c6f18c5edfce15320789941'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/packages/datastructures.scm'>
<input type='hidden' name='id' value='6098a386a90f63fc8c6f18c5edfce15320789941'/><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=6098a386a90f63fc8c6f18c5edfce15320789941'>root</a>/<a href='/guix/log/gnu?id=6098a386a90f63fc8c6f18c5edfce15320789941'>gnu</a>/<a href='/guix/log/gnu/packages?id=6098a386a90f63fc8c6f18c5edfce15320789941'>packages</a>/<a href='/guix/log/gnu/packages/datastructures.scm?id=6098a386a90f63fc8c6f18c5edfce15320789941'>datastructures.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/packages/datastructures.scm?id=6098a386a90f63fc8c6f18c5edfce15320789941&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2017-12-12 05:12:13 +0100'>2017-12-12</span></td><td><a href='/guix/commit/gnu/packages/datastructures.scm?id=cc3ac162c558a51c90b76b84b081a15e28d0baad'>gnu: Add uthash.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/datastructures.scm (uthash): New public variable.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-06-15 10:34:22 +0200'>2017-06-15</span></td><td><a href='/guix/commit/gnu/packages/datastructures.scm?id=a3f8aae4a159baf2de10c1f8860d7128c89fbb0c'>gnu: liburcu: Update to 0.10.0.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/databases.scm (liburcu): Update to 0.10.0.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-04-17 02:04:08 +0200'>2017-04-17</span></td><td><a href='/guix/commit/gnu/packages/datastructures.scm?id=d1e4ad1b02b2ea888557d3272c50b676faf18ca4'>gnu: Fix typos in descriptions.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/admin.scm (di)[description]: Likewise.
* gnu/packages/bioinformatics.scm (r-annotate)[description]: Likewise.
* gnu/packages/datastructures.scm (sparsehash)[description]: Likewise.
* gnu/packages/dns.scm (knot)[description]: Likewise.
* gnu/packages/emacs.scm (emacs-idle-highlight)[synopsis, description]:
Likewise.
* gnu/packages/gnome.scm (libpeas)[description]: Likewise.
* gnu/packages/gtk.scm (python2-pygtk)[description]: Likewise.
* gnu/packages/kde-frameworks.scm (kactivities)[description]: Fix typo.
* gnu/packages/libevent.scm (perl-anyevent)[description]: Likewise.
* gnu/packages/machine-learning.scm (ghmm)[description]: Likewise.
* gnu/packages/mail.scm (mlmmj)[description]: Likewise.
* gnu/packages/maths.scm (vc)[description]: Likewise.
* gnu/packages/music.scm (gx-super-fuzz-lv2)[description]: Likewise.
* gnu/packages/networking.scm (nload)[description]: Likewise.
* gnu/packages/python.scm (python-execnet)[description]: Likewise.
* gnu/packages/terminals.scm (tilda)[description]: Likewise.
* gnu/packages/python.scm (python-execnet, python-tables)
(python2-coverage-test-runner, python2-rope)[description]: Likewise.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2017-03-17 02:32:00 +0100'>2017-03-17</span></td><td><a href='/guix/commit/gnu/packages/datastructures.scm?id=754667f0eb44491370a2ec4fa0b4705cfcf6d237'>gnu: Add liburcu.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/datastructures.scm (liburcu): New variable.
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2016-07-19 23:03:30 +0200'>2016-07-19</span></td><td><a href='/guix/commit/gnu/packages/datastructures.scm?id=592ccdd38850d581f669f834f051ee8f92d7ee31'>gnu: Add ssdeep.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/datastructures.scm (ssdeep): New variable.

Signed-off-by: Ludovic Courtès &lt;ludo@gnu.org&gt;
</span></span></td><td>Tobias Geerinckx-Rice</td></tr>
<tr><td><span title='2016-03-01 10:30:04 +0100'>2016-03-01</span></td><td><a href='/guix/commit/gnu/packages/datastructures.scm?id=b4464d384c7a7b500e611ec257cf092cdc47d977'>gnu: Add gdsl.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/packages/datastructures.scm (gdsl): New variable.
</span></span></td><td>Ricardo Wurmus</td></tr>