From: Dave Barach <dave@barachs.net>
Date: Wed, 26 Oct 2016 18:03:20 +0000 (-0400)
Subject: Fix unformat-at-eof bug
X-Git-Tag: v17.01-rc0~44
X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F00%2F3600%2F2;p=vpp.git

Fix unformat-at-eof bug

Change-Id: Id9a64303b1d415b55a3bc0ea1483df6fc2eb5011
Signed-off-by: Dave Barach <dave@barachs.net>
---

diff --git a/vppinfra/vppinfra/unformat.c b/vppinfra/vppinfra/unformat.c
index 22d282a078f..ac8b7ddc712 100644
--- a/vppinfra/vppinfra/unformat.c
+++ b/vppinfra/vppinfra/unformat.c
@@ -988,7 +988,7 @@ unformat_user (unformat_input_t * input, unformat_function_t * func, ...)
   result = func (input, &va);
   va_end (va);
 
-  if (!result)
+  if (!result && input->index != UNFORMAT_END_OF_INPUT)
     input->index = input->buffer_marks[l];
 
   _vec_len (input->buffer_marks) = l;