Merge pull request #585 from redboltz/fix_584

redboltz · web-flow · commit d85e731ab472 · 2017-04-12T19:02:24.000+09:00
Fixed #584.
diff --git a/include/msgpack/v2/parse.hpp b/include/msgpack/v2/parse.hpp
@@ -96,12 +96,10 @@ class context {
             return PARSE_STOP_VISITOR;
         }
         parse_return ret = m_stack.consume(holder());
-        if (ret == PARSE_CONTINUE) {
-            m_cs = MSGPACK_CS_HEADER;
-        }
-        else {
+        if (ret != PARSE_CONTINUE) {
             off = m_current - m_start;
         }
+        m_cs = MSGPACK_CS_HEADER;
         return ret;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -96,12 +96,10 @@ class context {`
`96`	`96`	`return PARSE_STOP_VISITOR;`
`97`	`97`	`}`
`98`	`98`	`parse_return ret = m_stack.consume(holder());`
`99`		`- if (ret == PARSE_CONTINUE) {`
`100`		`- m_cs = MSGPACK_CS_HEADER;`
`101`		`- }`
`102`		`- else {`
	`99`	`+ if (ret != PARSE_CONTINUE) {`
`103`	`100`	`off = m_current - m_start;`
`104`	`101`	`}`
	`102`	`+ m_cs = MSGPACK_CS_HEADER;`
`105`	`103`	`return ret;`
`106`	`104`	`}`
`107`	`105`