From a96f01f355c5774f72e98d23ac0fd2509d347869 Mon Sep 17 00:00:00 2001
From: Mathias Laurenz Baumann <marenz@nebel.localdomain>
Date: Sat, 20 Feb 2010 22:18:39 +0100
Subject: [PATCH] fixed bug in bin-var parsing

---
 src/parser.c                      | 48 +++++++++++++++----------------
 src/tests/enter_leave_context.txt |  4 +--
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/src/parser.c b/src/parser.c
index aaadde5..135953c 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -307,19 +307,8 @@ inline int PSYC_parseElement(
 				*vlength= dlength - *cursor -3;
 			}else
 			{
-			*vlength=0;
-			while(1)
-			{
-				if(dlength<=++(*cursor)) // incremented cursor inside lenght?
-				{
-					*cursor=startc; // set to start value
-					return 1; // return insufficient
-				}
-
-				if(0 == method && data[*cursor] == '\n')
-					break;
-
-				if(1 == method && data[*cursor] == '|')
+				*vlength=0;
+				while(1)
 				{
 					if(dlength<=++(*cursor)) // incremented cursor inside lenght?
 					{
@@ -327,15 +316,26 @@ inline int PSYC_parseElement(
 						return 1; // return insufficient
 					}
 
-					/* packet finishes here */
-					if(data[*cursor] == '\n')
-					{	
-						*cursor+=1;
-						return 3;
+					if(0 == method && data[*cursor] == '\n')
+						break;
+
+					if(1 == method && data[*cursor] == '|')
+					{
+						if(dlength<=++(*cursor)) // incremented cursor inside lenght?
+						{
+							*cursor=startc; // set to start value
+							return 1; // return insufficient
+						}
+
+						/* packet finishes here */
+						if(data[*cursor] == '\n')
+						{	
+							*cursor+=1;
+							return 3;
+						}
 					}
-				}
-				++(*vlength); 
-			}}
+					++(*vlength); 
+				}}
 		}
 	}else if(inHeader == 0 && method==0 && data[*cursor] == ' ') // oi, its a binary var!
 	{ // after SP the length follows.
@@ -355,7 +355,7 @@ inline int PSYC_parseElement(
 		// after the length a TAB follows
 		if(data[*cursor] != '\t')
 			return -8;
-		
+
 		// now we have the length. convert it to int
 		int binLength = atoi(bin_length_str);
 		// is that still in this buffer?
@@ -365,9 +365,9 @@ inline int PSYC_parseElement(
 			return 1;
 		}
 
-		*value = data + *cursor;		
+		*value = data + *cursor+1;		
 		*vlength=binLength;
-		*cursor += binLength;
+		*cursor += binLength+1;
 	}else
 		return -8;
 
diff --git a/src/tests/enter_leave_context.txt b/src/tests/enter_leave_context.txt
index ea2bc56..b201ad9 100644
--- a/src/tests/enter_leave_context.txt
+++ b/src/tests/enter_leave_context.txt
@@ -7,9 +7,9 @@ _request_context_enter
 :_target	psyc://p5B084547.dip.t-dialin.net/@test
 
 :_more	vars
-:_bin 4	1
+:_bin 6	"1
 3
-
+"
 :_entity	variablevalue
 _notice_context_leave
 |