Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions NativeScript/runtime/Interop.mm
Original file line number Diff line number Diff line change
Expand Up @@ -365,16 +365,13 @@ static bool SnapshotArrayLike(Isolate* isolate, Local<Object> object, Local<v8::
// Always copy: an external one-byte string's resource (e.g. one made by
// node_api_create_external_string_latin1) holds Latin-1 with no NUL
// terminator, so its data can't be handed to native code as a C string.
v8::String::Utf8Value utf8Value(isolate, arg);
const char* value = strdup(*utf8Value);
// The external string only ties the strdup'd buffer's lifetime to the
// GC; it is never read as a string. Its length counts the NUL so it is
// never zero: V8 disposes a zero-length resource immediately.
OneByteStringResource* resource =
new OneByteStringResource(value, (size_t)utf8Value.length() + 1);
OneByteStringResource::NewUtf8Copy(isolate, arg.As<v8::String>());
// The external string only ties the copy's lifetime to the GC; it is
// never read as a string.
bool success = v8::String::NewExternalOneByte(isolate, resource).ToLocal(&arg);
tns::Assert(success, isolate);
Interop::SetValue(dest, value);
Interop::SetValue(dest, resource->data());
} else {
BaseDataWrapper* wrapper = tns::GetValue(isolate, arg);
if (wrapper == nullptr) {
Expand Down
25 changes: 19 additions & 6 deletions NativeScript/runtime/OneByteStringResource.cpp
Original file line number Diff line number Diff line change
@@ -1,22 +1,35 @@
#include "OneByteStringResource.h"

#include <cstdlib>
#include <new>

using namespace v8;

namespace tns {

OneByteStringResource::OneByteStringResource(const char* data, size_t length):
data_(data), length_(length) {
OneByteStringResource* OneByteStringResource::NewUtf8Copy(Isolate* isolate,
Local<String> str) {
size_t byteLength = str->Utf8LengthV2(isolate);
void* block = std::malloc(sizeof(OneByteStringResource) + byteLength + 1);
OneByteStringResource* resource =
new (block) OneByteStringResource(byteLength + 1);
// Same flags as String::Utf8Value.
str->WriteUtf8V2(isolate, reinterpret_cast<char*>(resource + 1),
byteLength + 1,
String::WriteFlags::kNullTerminate |
String::WriteFlags::kReplaceInvalidUtf8);
return resource;
}

OneByteStringResource::~OneByteStringResource() {
// data_ comes from strdup (see Interop::WriteValue's CStringEncoding path).
std::free(const_cast<char*>(this->data_));
OneByteStringResource::OneByteStringResource(size_t length) : length_(length) {}

void OneByteStringResource::Dispose() {
this->~OneByteStringResource();
std::free(this);
}

const char* OneByteStringResource::data() const {
return this->data_;
return reinterpret_cast<const char*>(this + 1);
}

size_t OneByteStringResource::length() const {
Expand Down
31 changes: 21 additions & 10 deletions NativeScript/runtime/OneByteStringResource.h
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,28 @@

namespace tns {

class OneByteStringResource : public v8::String::ExternalOneByteStringResource {
public:
OneByteStringResource(const char* data, size_t length);
~OneByteStringResource() override;
const char* data() const override;
size_t length() const override;
private:
const char* data_;
size_t length_;
};
// A NUL-terminated UTF-8 copy of a JS string, stored in the same allocation as
// the resource. V8 releases it through Dispose(), never through delete.
class OneByteStringResource final
: public v8::String::ExternalOneByteStringResource {
public:
static OneByteStringResource* NewUtf8Copy(v8::Isolate* isolate,
v8::Local<v8::String> str);

const char* data() const override;
// The UTF-8 byte count plus the NUL, so it is never zero: V8 disposes a
// zero-length resource as soon as it is handed one.
size_t length() const override;

protected:
void Dispose() override;

private:
explicit OneByteStringResource(size_t length);
~OneByteStringResource() override = default;

size_t length_;
};
}

#endif /* OneByteStringResource_h */
Loading