Fixed nodejs/node-v0.x-archive#8683

nwjs · Nov 19, 2014 · 1309297 · 1309297
1 parent 255644a
commit 1309297
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 28 deletions.
diff --git a/src/node_buffer.cc b/src/node_buffer.cc
@@ -119,12 +119,24 @@ size_t Length(Handle<Object> obj) {
 
 Local<Object> New(Isolate* isolate, Handle<String> string, enum encoding enc) {
   EscapableHandleScope scope(isolate);
-
-  size_t length = StringBytes::Size(isolate, string, enc);
+  Local<String> tmp_string;
+
+  if (string->IsExternalAscii()) {
+    const String::ExternalAsciiStringResource* ext;
+    ext = string->GetExternalAsciiStringResource();
+    tmp_string = String::NewFromOneByte(isolate, reinterpret_cast<const uint8_t*>(ext->data()), String::NewStringType::kNormalString, ext->length());
+  } else if (string->IsExternal()) {
+    const String::ExternalStringResource* ext;
+    ext = string->GetExternalStringResource();
+    tmp_string = String::NewFromTwoByte(isolate, ext->data(), String::NewStringType::kNormalString, ext->length());
+  } else {
+    tmp_string = string;
+  }
+  size_t length = StringBytes::Size(isolate, tmp_string, enc);
 
   Local<Object> buf = New(length);
   char* data = Buffer::Data(buf);
-  StringBytes::Write(isolate, data, length, string, enc);
+  StringBytes::Write(isolate, data, length, tmp_string, enc);
 
   return scope.Escape(buf);
 }

diff --git a/src/string_bytes.cc b/src/string_bytes.cc
@@ -303,6 +303,14 @@ size_t StringBytes::Write(Isolate* isolate,
 
   CHECK(val->IsString() == true);
   Local<String> str = val.As<String>();
+  bool is_extern_ascii = is_extern && str->IsExternalAscii();
+  if (is_extern) {
+    if (is_extern_ascii) {
+      str = String::NewFromOneByte(isolate, reinterpret_cast<const uint8_t*>(data), String::NewStringType::kNormalString, len);
+    } else {
+      str = String::NewFromTwoByte(isolate, reinterpret_cast<const uint16_t*>(data), String::NewStringType::kNormalString, len);
+    }
+  }
   len = len < buflen ? len : buflen;
 
   int flags = String::NO_NULL_TERMINATION |
@@ -312,53 +320,40 @@ size_t StringBytes::Write(Isolate* isolate,
     case ASCII:
     case BINARY:
     case BUFFER:
-      if (is_extern)
-        memcpy(buf, data, len);
-      else
-        len = str->WriteOneByte(reinterpret_cast<uint8_t*>(buf),
-                                0,
-                                buflen,
-                                flags);
+      len = str->WriteOneByte(reinterpret_cast<uint8_t*>(buf),
+                              0,
+                              buflen,
+                              flags);
       if (chars_written != NULL)
         *chars_written = len;
       break;
 
     case UTF8:
-      if (is_extern)
-        memcpy(buf, data, len);
-      else
-        len = str->WriteUtf8(buf, buflen, chars_written, flags);
+      len = str->WriteUtf8(buf, buflen, chars_written, flags);
       break;
 
     case UCS2:
-      if (is_extern)
-        memcpy(buf, data, len * 2);
-      else
-        len = str->Write(reinterpret_cast<uint16_t*>(buf), 0, buflen, flags);
+      len = str->Write(reinterpret_cast<uint16_t*>(buf), 0, buflen, flags);
       if (chars_written != NULL)
         *chars_written = len;
       len = len * sizeof(uint16_t);
       break;
 
     case BASE64:
-      if (is_extern) {
-        base64_decode(buf, buflen, data, len);
-      } else {
+      do {
         String::Value value(str);
         len = base64_decode(buf, buflen, *value, value.length());
-      }
+      } while (0);
       if (chars_written != NULL) {
         *chars_written = len;
       }
       break;
 
     case HEX:
-      if (is_extern) {
-        hex_decode(buf, buflen, data, len);
-      } else {
+      do {
         String::Value value(str);
         len = hex_decode(buf, buflen, *value, value.length());
-      }
+      } while (0);
       if (chars_written != NULL) {
         *chars_written = len * 2;
       }
@@ -446,10 +441,17 @@ size_t StringBytes::Size(Isolate* isolate,
     return Buffer::Length(val);
 
   const char* data;
-  if (GetExternalParts(isolate, val, &data, &data_size))
-    return data_size;
+  bool is_extern = GetExternalParts(isolate, val, &data, &data_size);
 
   Local<String> str = val->ToString();
+  bool is_extern_ascii = is_extern && str->IsExternalAscii();
+  if (is_extern) {
+    if (is_extern_ascii) {
+      str = String::NewFromOneByte(isolate, reinterpret_cast<const uint8_t*>(data), String::NewStringType::kNormalString, data_size);
+    } else {
+      str = String::NewFromTwoByte(isolate, reinterpret_cast<const uint16_t*>(data), String::NewStringType::kNormalString, data_size);
+    }
+  }
 
   switch (encoding) {
     case BINARY: