From 2bd503556d1074b3d42469413359034d00f954fd Mon Sep 17 00:00:00 2001
From: Guillaume Melquiond <guillaume.melquiond@gmail.com>
Date: Sun, 14 May 2006 18:05:16 +0000
Subject: Replaced strnlen by memchr.

---
 src/messagein.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/messagein.cpp b/src/messagein.cpp
index 2559f7fb..f5ae44db 100644
--- a/src/messagein.cpp
+++ b/src/messagein.cpp
@@ -104,8 +104,9 @@ std::string MessageIn::readString(int length)
         }
 
         // Read the string
-        int stringLength = strnlen(mPacket->data + mPos, length);
-        std::string readString(mPacket->data + mPos, stringLength);
+        char const *stringBeg = mPacket->data + mPos,
+                   *stringEnd = (char const *)memchr(stringBeg, '\0', length);
+        std::string readString(stringBeg, stringEnd ? stringEnd - stringBeg : length);
         mPos += length;
         return readString;
     }
-- 
cgit v1.2.3-70-g09d2