diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2015-03-03 15:09:58 +0100 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-03-05 20:44:18 +0100 |
| commit | 364cc7e08a5d4b74891362f837ff9c34844c3d35 (patch) | |
| tree | d371801fcbad38a4016eada51ed52ae70765169b /src/string_bytes.cc | |
| parent | 826cde866170918fbeeeffc8612d4f4e0a923869 (diff) | |
| download | android-node-v8-364cc7e08a5d4b74891362f837ff9c34844c3d35.tar.gz android-node-v8-364cc7e08a5d4b74891362f837ff9c34844c3d35.tar.bz2 android-node-v8-364cc7e08a5d4b74891362f837ff9c34844c3d35.zip | |
src: remove NODE_INVALID_UTF8 environment variable
Introduced in joyent/node v0.10 as a backwards compatibility measure.
It's an ugly hack and allowing invalid UTF-8 is not a good idea in the
first place, remove it.
PR-URL: https://github.com/iojs/io.js/pull/1042
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
Diffstat (limited to 'src/string_bytes.cc')
| -rw-r--r-- | src/string_bytes.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/string_bytes.cc b/src/string_bytes.cc index c828363da6..4a91f25048 100644 --- a/src/string_bytes.cc +++ b/src/string_bytes.cc @@ -287,8 +287,9 @@ size_t StringBytes::Write(Isolate* isolate, Local<String> str = val.As<String>(); len = len < buflen ? len : buflen; - int flags = String::NO_NULL_TERMINATION | - String::HINT_MANY_WRITES_EXPECTED; + int flags = String::HINT_MANY_WRITES_EXPECTED | + String::NO_NULL_TERMINATION | + String::REPLACE_INVALID_UTF8; switch (encoding) { case ASCII: @@ -311,7 +312,7 @@ size_t StringBytes::Write(Isolate* isolate, // well? memcpy(buf, data, len); else - len = str->WriteUtf8(buf, buflen, chars_written, WRITE_UTF8_FLAGS); + len = str->WriteUtf8(buf, buflen, chars_written, flags); break; case UCS2: |