Commit 25dd890
deps: V8: cherry-pick e5dbc95
Original commit message:
[api] Fix handle leak when getting Context embedder data
The `Context::SlowGetAlignedPointerFromEmbedderData()` method returns
a pointer, so the fact that it allocates handles is not obvious to
the caller.
Since this is the slow path anyway, simply add a handle scope inside
of it.
The tests are also modified to perform the same check for the
`Object` equivalent of this method.
Change-Id: I5f03c9a7b70b3a17315609df021606a53c9feb2d
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1879902
Reviewed-by: Yang Guo <yangguo@chromium.org>
Commit-Queue: Yang Guo <yangguo@chromium.org>
Cr-Commit-Position: refs/heads/master@{#64583}
Refs: v8/v8@e5dbc95
Fixes: #30127
Backport-PR-URL: #30109
PR-URL: #30130
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>1 parent 98dfe27 commit 25dd890
3 files changed
Lines changed: 8 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -38,7 +38,7 @@ | |||
| 38 | 38 | ||
| 39 | 39 | # Reset this number to 0 on major V8 upgrades. | |
| 40 | 40 | # Increment by one for each non-official patch applied to deps/v8. | |
| 41 | - 'v8_embedder_string': '-node.13', | ||
| 41 | + 'v8_embedder_string': '-node.14', | ||
| 42 | 42 | ||
| 43 | 43 | ##### V8 defaults for Node.js ##### | |
| 44 | 44 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1314,6 +1314,7 @@ void Context::SetEmbedderData(int index, v8::Local<Value> value) { | |||
| 1314 | 1314 | ||
| 1315 | 1315 | void* Context::SlowGetAlignedPointerFromEmbedderData(int index) { | |
| 1316 | 1316 | const char* location = "v8::Context::GetAlignedPointerFromEmbedderData()"; | |
| 1317 | + HandleScope handle_scope(GetIsolate()); | ||
| 1317 | 1318 | i::Handle<i::EmbedderDataArray> data = | |
| 1318 | 1319 | EmbedderDataFor(this, index, false, location); | |
| 1319 | 1320 | if (data.is_null()) return nullptr; | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -2955,8 +2955,11 @@ THREADED_TEST(SetAlignedPointerInInternalFields) { | |||
| 2955 | 2955 | ||
| 2956 | 2956 | obj->SetAlignedPointerInInternalFields(2, indices, values); | |
| 2957 | 2957 | CcTest::CollectAllGarbage(); | |
| 2958 | - CHECK_EQ(heap_allocated_1, obj->GetAlignedPointerFromInternalField(0)); | ||
| 2959 | - CHECK_EQ(heap_allocated_2, obj->GetAlignedPointerFromInternalField(1)); | ||
| 2958 | + { | ||
| 2959 | + v8::SealHandleScope no_handle_leak(isolate); | ||
| 2960 | + CHECK_EQ(heap_allocated_1, obj->GetAlignedPointerFromInternalField(0)); | ||
| 2961 | + CHECK_EQ(heap_allocated_2, obj->GetAlignedPointerFromInternalField(1)); | ||
| 2962 | + } | ||
| 2960 | 2963 | ||
| 2961 | 2964 | indices[0] = 1; | |
| 2962 | 2965 | indices[1] = 0; | |
@@ -3009,6 +3012,7 @@ THREADED_TEST(EmbedderDataAlignedPointers) { | |||
| 3009 | 3012 | } | |
| 3010 | 3013 | CcTest::CollectAllGarbage(); | |
| 3011 | 3014 | for (int i = 0; i < 100; i++) { | |
| 3015 | + v8::SealHandleScope no_handle_leak(env->GetIsolate()); | ||
| 3012 | 3016 | CHECK_EQ(AlignedTestPointer(i), env->GetAlignedPointerFromEmbedderData(i)); | |
| 3013 | 3017 | } | |
| 3014 | 3018 | } | |
0 commit comments