From dc98472f2cc6fb4183afc3bdcea0cfa650bfd0e2 Mon Sep 17 00:00:00 2001
From: JoelKatz <DavidJoelSchwartz@GMail.com>
Date: Thu, 26 Apr 2012 18:59:08 -0700
Subject: [PATCH] Bugfixes.

---
 src/Serializer.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Serializer.cpp b/src/Serializer.cpp
index 900770656..9fc00a630 100644
--- a/src/Serializer.cpp
+++ b/src/Serializer.cpp
@@ -259,6 +259,7 @@ int Serializer::addVL(const std::vector<unsigned char>& vector)
 {
 	int ret = addRaw(encodeVL(vector.size()));
 	addRaw(vector);
+	assert(mData.size() + (ret + vector.size() + encodeLengthLength(vector.size())));
 	return ret;
 }
 
@@ -355,7 +356,7 @@ bool Serializer::getVL(std::vector<unsigned char>& objectVL, int offset, int& le
 bool Serializer::getVLLength(int& length, int offset) const
 {
 	int b1;
-	if (!get8(b1, ++offset)) return false;
+	if (!get8(b1, offset++)) return false;
 
 	int lenLen = decodeLengthLength(b1);
 	try
@@ -365,14 +366,14 @@ bool Serializer::getVLLength(int& length, int offset) const
 		else if (lenLen == 2)
 		{
 			int b2;
-			if (!get8(b2, ++offset)) return false;
+			if (!get8(b2, offset++)) return false;
 			length=decodeVLLength(b1, b2);
 		}
 		else if (lenLen == 3)
 		{
 			int b2, b3;
-			if (!get8(b2, ++offset)) return false;
-			if (!get8(b3, ++offset)) return false;
+			if (!get8(b2, offset++)) return false;
+			if (!get8(b3, offset++)) return false;
 			length = decodeVLLength(b1, b2, b3);
 		}
 		else return false;