new: allow utf16 string with length

nodejs · Oct 7, 2015 · 66ac6e6 · 66ac6e6
1 parent 7764a9a
commit 66ac6e6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/doc/new.md b/doc/new.md
@@ -64,6 +64,7 @@ Nan::MaybeLocal<v8::String> Nan::New<T>(std::string const& value);
 Nan::MaybeLocal<v8::String> Nan::New<T>(const char * value, int length);
 Nan::MaybeLocal<v8::String> Nan::New<T>(const char * value);
 Nan::MaybeLocal<v8::String> Nan::New<T>(const uint16_t * value);
+Nan::MaybeLocal<v8::String> Nan::New<T>(const uint16_t * value, int length);
 ```
 
 Specialized types:

diff --git a/nan_new.h b/nan_new.h
@@ -299,6 +299,12 @@ New(const char * value, int length) {
   return New<v8::String>(value, length);
 }
 
+inline
+imp::Factory<v8::String>::return_t
+New(const uint16_t * value, int length) {
+  return New<v8::String>(value, length);
+}
+
 inline
 imp::Factory<v8::String>::return_t
 New(const char * value) {

diff --git a/test/cpp/nannew.cpp b/test/cpp/nannew.cpp
@@ -289,7 +289,7 @@ NAN_METHOD(testSignature) {
 NAN_METHOD(testString) {
   Tap t(info[0]);
 
-  t.plan(14);
+  t.plan(16);
 
   t.ok(_( stringMatches(
       New<String>("Hello World").ToLocalChecked(), "Hello World")));
@@ -319,6 +319,10 @@ NAN_METHOD(testString) {
   t.ok(_( stringMatches( New("Hello World", 4).ToLocalChecked(), "Hell")));
   t.ok(_( assertType<String>( New("plonk.", 4).ToLocalChecked())));
 
+  const uint16_t *widestring = reinterpret_cast<const uint16_t *>("H\0e\0l\0l\0o\0");
+  t.ok(_( stringMatches( New(widestring, 4).ToLocalChecked(), "Hell")));
+  t.ok(_( assertType<String>( New(widestring, 4).ToLocalChecked())));
+
   t.ok(_( stringMatches( New(std::string("bar")).ToLocalChecked(), "bar")));
   t.ok(_( assertType<String>( New(std::string("plonk.")).ToLocalChecked())));