diff options
author | Joshua Haberman <jhaberman@gmail.com> | 2016-11-15 09:29:46 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-15 09:29:46 -0800 |
commit | c6f3d700b90cd51328c8b5f6c144789ca237e771 (patch) | |
tree | 13dd68fb6aa1dcc412a4e9d50e082986f1c897a2 /js/binary/encoder.js | |
parent | 6e93fa41c4f8666ee7ccd65026c9b7078bf0309a (diff) | |
parent | bd850a25f51dfb662a761473c151c016c815bcb5 (diff) |
Merge pull request #1907 from evokly/js-utf8-fix
JS: Fix for high utf-8 codepoints.
Diffstat (limited to 'js/binary/encoder.js')
-rw-r--r-- | js/binary/encoder.js | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/js/binary/encoder.js b/js/binary/encoder.js index c9b0c2ae..d952d714 100644 --- a/js/binary/encoder.js +++ b/js/binary/encoder.js @@ -409,19 +409,36 @@ jspb.BinaryEncoder.prototype.writeFixedHash64 = function(hash) { */ jspb.BinaryEncoder.prototype.writeString = function(value) { var oldLength = this.buffer_.length; - - // UTF16 to UTF8 conversion loop swiped from goog.crypt.stringToUtf8ByteArray. + for (var i = 0; i < value.length; i++) { + var c = value.charCodeAt(i); + if (c < 128) { this.buffer_.push(c); } else if (c < 2048) { this.buffer_.push((c >> 6) | 192); this.buffer_.push((c & 63) | 128); - } else { - this.buffer_.push((c >> 12) | 224); - this.buffer_.push(((c >> 6) & 63) | 128); - this.buffer_.push((c & 63) | 128); + } else if (c < 65536) { + // Look for surrogates + if (c >= 0xD800 && c <= 0xDBFF && i + 1 < value.length) { + var second = value.charCodeAt(i + 1); + if (second >= 0xDC00 && second <= 0xDFFF) { // low surrogate + // http://mathiasbynens.be/notes/javascript-encoding#surrogate-formulae + c = (c - 0xD800) * 0x400 + second - 0xDC00 + 0x10000; + + this.buffer_.push((c >> 18) | 240); + this.buffer_.push(((c >> 12) & 63 ) | 128); + this.buffer_.push(((c >> 6) & 63) | 128); + this.buffer_.push((c & 63) | 128); + i++; + } + } + else { + this.buffer_.push((c >> 12) | 224); + this.buffer_.push(((c >> 6) & 63) | 128); + this.buffer_.push((c & 63) | 128); + } } } |