Merge commit 'v1.2.1.22' into stripped

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/CMakeLists.txt
	src/Makefile.am
	src/guichan/gui.cpp

1 files changed, 26 insertions, 1 deletions

diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index 0fbf7162b..4fb61dc6a 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -2,7 +2,7 @@
  *  The ManaPlus Client
  *  Copyright (C) 2004-2009  The Mana World Development Team
  *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011  The ManaPlus Developers
+ *  Copyright (C) 2011-2012  The ManaPlus Developers
  *
  *  This file is part of The ManaPlus Client.
  *
@@ -241,4 +241,29 @@ std::string MessageIn::readRawString(int length)
     return str;
 }
 
+char *MessageIn::readBytes(int length)
+{
+    // Get string length
+    if (length < 0)
+        length = readInt16();
+
+    // Make sure the string isn't erroneous
+    if (length < 0 || mPos + length > mLength)
+    {
+        mPos = mLength + 1;
+        DEBUGLOG("readBytesString error");
+        return nullptr;
+    }
+
+    char *buf = new char[length + 2];
+
+    memcpy (buf, mData + mPos, length);
+    buf[length] = 0;
+    buf[length + 1] = 0;
+    mPos += length;
+
+    PacketCounters::incInBytes(length);
+    return buf;
+}
+
 }