Merge pull request #275 from NativeScript/slavchev/fix-issue-271

fix issue #271
NativeScript · Nov 23, 2015 · c33b18a · c33b18a
2 parents 1a28e19 + 38ef635
commit c33b18a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git a/src/jni/V8GlobalHelpers.cpp b/src/jni/V8GlobalHelpers.cpp
@@ -33,7 +33,9 @@ Local<String> tns::ConvertToV8String(const jchar* data, int length)
 Local<String> tns::ConvertToV8String(const string& s)
 {
 	auto isolate = Isolate::GetCurrent();
-	return String::NewFromUtf8(isolate, s.c_str());
+	Local<String> str;
+	String::NewFromUtf8(isolate, s.c_str(), NewStringType::kNormal, s.length()).ToLocal(&str);
+	return str;
 }
 
 Local<String> tns::ConvertToV8String(const char *data, int length)

diff --git a/test-app/assets/app/modules/moduleWithNullChar.js b/test-app/assets/app/modules/moduleWithNullChar.js
diff --git a/test-app/assets/app/tests/tests.js b/test-app/assets/app/tests/tests.js
@@ -1886,4 +1886,9 @@ describe("Tests ", function () {
 		expect(exceptionCaught).toBe(true);
 	});
 
+	it("should load module with null char in it", function () {
+		var text = require("../modules/moduleWithNullChar").text;
+		var s = "Hello world";
+		expect(text.length).toBe(s.length);
+	});
 });