Fix multi byte characters getting corrupted

Author: Ruben Bridgewater

changelog.md

@@ -1,3 +1,9 @@
+## v.2.0.4 - 21 Jul, 2016
+
+Bugfixes
+
+-  Fixed multi byte characters getting corrupted
+
 ## v.2.0.3 - 17 Jun, 2016
 
 Bugfixes

lib/parser.js

@@ -1,5 +1,7 @@
 'use strict'
 
+var StringDecoder = require('string_decoder').StringDecoder
+var decoder = new StringDecoder()
 var ReplyError = require('./replyError')
 var bufferPool = new Buffer(32 * 1024)
 var bufferOffset = 0
@@ -295,12 +297,12 @@ function concatBulkString (parser) {
   } else {
     chunks++
   }
-  var res = list[0].toString('utf8', parser.bigOffset)
+  var res = decoder.write(list[0].slice(parser.bigOffset))
   for (var i = 1; i < chunks - 2; i++) {
     // We are only safe to fully add up elements that are neither the first nor any of the last two elements
-    res += list[i].toString()
+    res += decoder.write(list[i])
   }
-  res += list[i].toString('utf8', 0, offset === 1 ? list[i].length - 1 : offset - 2)
+  res += decoder.end(list[i].slice(0, offset === 1 ? list[i].length - 1 : offset - 2))
   return res
 }
 

test/parsers.spec.js

@@ -289,7 +289,7 @@ describe('parsers', function () {
       it('should handle \\r and \\n characters properly', function () {
         // If a string contains \r or \n characters it will always be send as a bulk string
         var replyCount = 0
-        var entries = ['foo\r', 'foo\r\nbar', '\r\nfoo', 'foo\r\n', 'foo', 'foobar', 'foo\r', 'äfooöü', 'abc']
+        var entries = ['foo\r', 'foo\r\nbar', '\r\nСанкт-Пет', 'foo\r\n', 'foo', 'foobar', 'foo\r', 'äfooöü', 'abc']
         function checkReply (reply) {
           assert.strictEqual(reply, entries[replyCount])
           replyCount++
@@ -300,9 +300,11 @@ describe('parsers', function () {
           returnFatalError: returnFatalError
         })
 
-        parser.execute(new Buffer('$4\r\nfoo\r\r\n$8\r\nfoo\r\nbar\r\n$5\r\n\r\n'))
+        parser.execute(new Buffer('$4\r\nfoo\r\r\n$8\r\nfoo\r\nbar\r\n$19\r\n\r\n'))
+        parser.execute(new Buffer([208, 161, 208, 176, 208, 189, 208]))
+        parser.execute(new Buffer([186, 209, 130, 45, 208, 159, 208, 181, 209, 130]))
         assert.strictEqual(replyCount, 2)
-        parser.execute(new Buffer('foo\r\n$5\r\nfoo\r\n\r\n'))
+        parser.execute(new Buffer('\r\n$5\r\nfoo\r\n\r\n'))
         assert.strictEqual(replyCount, 4)
         parser.execute(new Buffer('+foo\r'))
         assert.strictEqual(replyCount, 4)