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

---
 src/Serializer.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/Serializer.cpp b/src/Serializer.cpp
index 9fc00a630..ac3c029ba 100644
--- a/src/Serializer.cpp
+++ b/src/Serializer.cpp
@@ -81,7 +81,7 @@ int Serializer::addRaw(const void *ptr, int len)
 bool Serializer::get16(uint16& o, int offset) const
 {
 	if ((offset + 2) > mData.size()) return false;
-	o = mData.at(++offset);
+	o = mData.at(offset++);
 	o <<= 8; o |= mData.at(offset);
 	return true;
 }
@@ -89,8 +89,8 @@ bool Serializer::get16(uint16& o, int offset) const
 bool Serializer::get32(uint32& o, int offset) const
 {
 	if ((offset + 4) > mData.size()) return false;
-	o=mData.at(++offset);
-	o<<=8; o |= mData.at(++offset); o <<= 8; o |= mData.at(++offset);
+	o=mData.at(offset++);
+	o<<=8; o |= mData.at(offset++); o <<= 8; o |= mData.at(offset++);
 	o<<=8; o |= mData.at(offset);
 	return true;
 }
@@ -98,10 +98,10 @@ bool Serializer::get32(uint32& o, int offset) const
 bool Serializer::get64(uint64& o, int offset) const
 {
 	if ((offset + 8) > mData.size()) return false;
-	o=mData.at(++offset);
-	o<<=8; o|= mData.at(++offset); o <<= 8; o |= mData.at(++offset);
-	o<<=8; o|= mData.at(++offset); o <<= 8; o |= mData.at(++offset);
-	o<<=8; o|= mData.at(++offset); o <<= 8; o |= mData.at(++offset);
+	o=mData.at(offset++);
+	o<<=8; o|= mData.at(offset++); o <<= 8; o |= mData.at(offset++);
+	o<<=8; o|= mData.at(offset++); o <<= 8; o |= mData.at(offset++);
+	o<<=8; o|= mData.at(offset++); o <<= 8; o |= mData.at(offset++);
 	o<<=8; o|= mData.at(offset);
 	return true;
 }
@@ -390,12 +390,12 @@ bool Serializer::getTaggedList(std::list<TaggedListItem>& list, int offset, int&
 	list.clear();
 	int startOffset = offset;
 	int numElem;
-	if (!get8(numElem, ++offset)) return false;
+	if (!get8(numElem, offset++)) return false;
 	for (int i = 0; i<numElem; i++)
 	{
 		int tag, len;
 		std::vector<unsigned char> data;
-		if (!get8(tag, ++offset)) return false;
+		if (!get8(tag, offset++)) return false;
 		if (!getVL(data, offset, len)) return false;
 		offset += len;
 		list.push_back(std::make_pair(tag, data));
@@ -409,12 +409,12 @@ bool Serializer::getTaggedList(std::vector<TaggedListItem>& list, int offset, in
 	list.clear();
 	int startOffset=offset;
 	int numElem;
-	if (!get8(numElem, ++offset)) return false;
+	if (!get8(numElem, offset++)) return false;
 	for (int i=0; i<numElem; i++)
 	{
 		int tag, len;
 		std::vector<unsigned char> data;
-		if (!get8(tag, ++offset)) return false;
+		if (!get8(tag, offset++)) return false;
 		if (!getVL(data, offset, len)) return false;
 		offset += len;
 		list.push_back(std::make_pair(tag, data));