From e316c0b5cd11aeb8cc43326d1f89676b53bbffaa Mon Sep 17 00:00:00 2001 From: niczkx Date: Tue, 31 Jul 2012 02:02:41 -0600 Subject: [PATCH] Merge both getString functions in binarytree --- src/framework/core/binarytree.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/framework/core/binarytree.cpp b/src/framework/core/binarytree.cpp index c4b09f8f..730142f5 100644 --- a/src/framework/core/binarytree.cpp +++ b/src/framework/core/binarytree.cpp @@ -153,14 +153,8 @@ uint64 BinaryTree::getU64() std::string BinaryTree::getString() { - unserialize(); uint16 len = getU16(); - if(m_pos+len > m_buffer.size()) - stdext::throw_exception("BinaryTree: getString failed: string length exceeded buffer size."); - - std::string ret((char *)&m_buffer[m_pos], len); - m_pos += len; - return ret; + return getString(len); } std::string BinaryTree::getString(uint16 len)