diff options
| author | Anna Henningsen <anna@addaleax.net> | 2018-08-31 16:57:03 +0200 |
|---|---|---|
| committer | Anna Henningsen <anna@addaleax.net> | 2018-09-03 22:33:42 +0200 |
| commit | 71f633a32f1f5617c1c7b60ad936342a579bff74 (patch) | |
| tree | bcfc550c80f66a630cc149fbc80f204d0ca6cc62 /src/string_decoder.cc | |
| parent | 6455bea52ba262cea8d1c706ec8a2eec192ec643 (diff) | |
| download | android-node-v8-71f633a32f1f5617c1c7b60ad936342a579bff74.tar.gz android-node-v8-71f633a32f1f5617c1c7b60ad936342a579bff74.tar.bz2 android-node-v8-71f633a32f1f5617c1c7b60ad936342a579bff74.zip | |
src: allow UTF-16 in generic StringBytes decode call
This allows removing a number of special cases in other
parts of the code, at least one of which was incorrect
in expecting aligned input when that was not guaranteed.
Fixes: https://github.com/nodejs/node/issues/22358
PR-URL: https://github.com/nodejs/node/pull/22622
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Diffstat (limited to 'src/string_decoder.cc')
| -rw-r--r-- | src/string_decoder.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/string_decoder.cc b/src/string_decoder.cc index b75169ff00..fa8201faff 100644 --- a/src/string_decoder.cc +++ b/src/string_decoder.cc @@ -30,16 +30,6 @@ MaybeLocal<String> MakeString(Isolate* isolate, data, v8::NewStringType::kNormal, length); - } else if (encoding == UCS2) { -#ifdef DEBUG - CHECK_EQ(reinterpret_cast<uintptr_t>(data) % 2, 0); - CHECK_EQ(length % 2, 0); -#endif - ret = StringBytes::Encode( - isolate, - reinterpret_cast<const uint16_t*>(data), - length / 2, - &error); } else { ret = StringBytes::Encode( isolate, |