diff --git a/JsonParser/JsonToken.cpp b/JsonParser/JsonToken.cpp
index 4a8c1632..fdbc3af4 100644
--- a/JsonParser/JsonToken.cpp
+++ b/JsonParser/JsonToken.cpp
@@ -24,24 +24,20 @@ static void unescapeString(char* s)
 {
     char* readPtr = s;
     char* writePtr = s;
+    char c;
 
-    while (true)
+    do
     {
-        if (*readPtr == '\\')
+        c = *readPtr++;        
+
+        if (c == '\\')
         {
-            readPtr++;
-            *writePtr = unescapeChar(*readPtr);
-        }
-        else
-        {
-            *writePtr = *readPtr;
+            c = unescapeChar(*readPtr++);
         }
 
-        if (*writePtr == 0) break;
+        *writePtr++ = c;
 
-        readPtr++;
-        writePtr++;
-    }
+    } while (c != 0);
 }
 
 char* JsonToken::getText()