FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

fix(worker): throw when an environment-data key cannot be converted to a string by adrian-niculescu · Pull Request #2066 · NativeScript/android · GitHub

  1. NativeScript
  2. android

Repository navigation

fix(worker): throw when an environment-data key cannot be converted to a string #2066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
adrian-niculescu wants to merge 1 commit into
base: feat/worker-threads
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 3 Commits 1 Checks 3 Files changed
Open

fix(worker): throw when an environment-data key cannot be converted to a string #2066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .cpp  (1) .js  (1) All 2 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
46 changes: 46 additions & 0 deletions test-app/app/src/main/assets/app/tests/testMessaging.js
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,52 @@ describe("Messaging runtime edges", function () {
});
});

describe("environment data keys", function () {
it("keeps keys containing NUL distinct from their prefixes", function () {
var wt = require("node:worker_threads");
var prefix = "environment-key";
var key = prefix + "\0suffix";
try {
wt.setEnvironmentData(prefix, "prefix");
wt.setEnvironmentData(key, "full key");
expect(wt.getEnvironmentData(prefix)).toBe("prefix");
expect(wt.getEnvironmentData(key)).toBe("full key");
wt.setEnvironmentData(key);
expect(wt.getEnvironmentData(key)).toBeUndefined();
expect(wt.getEnvironmentData(prefix)).toBe("prefix");
} finally {
wt.setEnvironmentData(key);
wt.setEnvironmentData(prefix);
}
});

function thrownMessage(fn) {
try {
fn();
} catch (e) {
return e && e.message;
}
return "nothing thrown";
}

it("throws what a key's toString throws instead of using the empty-string key", function () {
var wt = require("node:worker_threads");
var key = { toString: function () { throw new Error("key toString failed"); } };
wt.setEnvironmentData("", "empty");
try {
expect(thrownMessage(function () { wt.setEnvironmentData(key, "other"); }))
.toBe("key toString failed");
expect(thrownMessage(function () { wt.getEnvironmentData(key); }))
.toBe("key toString failed");
expect(thrownMessage(function () { wt.setEnvironmentData(key); }))
.toBe("key toString failed");
expect(wt.getEnvironmentData("")).toBe("empty");
} finally {
wt.setEnvironmentData("");
}
});
});

describe("worker error reporting", function () {
// A worker boots on its own thread, so the first error arrives whenever
// the runner gets to it; specs wait for it and only then settle for
Expand Down
21 changes: 19 additions & 2 deletions test-app/runtime/src/main/cpp/Messaging.cpp
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -935,13 +935,27 @@ void SetEmitMessageCallback(const FunctionCallbackInfo<Value>& info) {
state->emitMessage.Reset(isolate, info[0].As<v8::Function>());
}

// The key as the string the store files it under. A key whose conversion throws
// leaves that exception pending for the caller rather than standing in for "".
static bool EnvironmentDataKey(Isolate* isolate, Local<Value> value, std::string& key) {
Local<v8::String> str;
if (!value->ToString(isolate->GetCurrentContext()).ToLocal(&str)) {
return false;
}
key = ArgConverter::ToString(isolate, str);
return true;
}

void SetEnvironmentDataCallback(const FunctionCallbackInfo<Value>& info) {
Isolate* isolate = info.GetIsolate();
if (info.Length() < 1) {
return;
}
Local<Context> context = isolate->GetCurrentContext();
std::string key = ArgConverter::ToString(isolate, info[0]);
std::string key;
if (!EnvironmentDataKey(isolate, info[0], key)) {
return;
}
if (info.Length() < 2 || info[1]->IsUndefined()) {
std::lock_guard<std::mutex> lock(g_environmentDataMutex);
g_environmentData.erase(key);
Expand All @@ -964,7 +978,10 @@ void GetEnvironmentDataCallback(const FunctionCallbackInfo<Value>& info) {
if (info.Length() < 1) {
return;
}
std::string key = ArgConverter::ToString(isolate, info[0]);
std::string key;
if (!EnvironmentDataKey(isolate, info[0], key)) {
return;
}
std::shared_ptr<serialization::SerializedValue> stored;
{
std::lock_guard<std::mutex> lock(g_environmentDataMutex);
Expand Down
Loading
Back | FazBrowse Home | New Git URL