From 364cc7e08a5d4b74891362f837ff9c34844c3d35 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Tue, 3 Mar 2015 15:09:58 +0100 Subject: 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 --- src/string_bytes.cc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/string_bytes.cc') 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 str = val.As(); 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: -- cgit v1.2.3