From: Klement Sekera <ksekera@cisco.com>
Date: Tue, 11 Dec 2018 15:55:33 +0000 (+0100)
Subject: fix vlib_buffer_chain_compress assert in debug
X-Git-Tag: v19.04-rc0~173
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=69db1a60846f3e7dea3e1f615c396c356a49532e

fix vlib_buffer_chain_compress assert in debug

replace vlib_buffer_advance with its code to work around assert

Change-Id: I6e332527f5e0c10d23305b6fc2e837d8b4f99e78
Signed-off-by: Klement Sekera <ksekera@cisco.com>
---

diff --git a/src/vlib/buffer_funcs.h b/src/vlib/buffer_funcs.h
index e8ccc86f1a9..c201fd672a5 100644
--- a/src/vlib/buffer_funcs.h
+++ b/src/vlib/buffer_funcs.h
@@ -1244,7 +1244,8 @@ vlib_buffer_chain_compress (vlib_main_t * vm,
 			first->current_length,
 			vlib_buffer_get_current (second), amount_to_copy);
       first->current_length += amount_to_copy;
-      vlib_buffer_advance (second, amount_to_copy);
+      second->current_data += amount_to_copy;
+      second->current_length -= amount_to_copy;
       if (first->flags & VLIB_BUFFER_TOTAL_LENGTH_VALID)
 	{
 	  first->total_length_not_including_first_buffer -= amount_to_copy;