mirror of
https://github.com/electron/electron.git
synced 2026-01-09 15:38:08 -05:00
471a14432f
* chore: bump chromium in DEPS to 143.0.7469.0 * 7021651: [//gpu] Fold handle creation into D3DImageBackingFactory Refs https://chromium-review.googlesource.com/c/chromium/src/+/7021651 * 7013047: Fix various C++23 build errors in //chrome Refs https://chromium-review.googlesource.com/c/chromium/src/+/7013047 * 7010850: [//ui] Port screen_mac.mm's calls to DisplayColorSpaces Refs https://chromium-review.googlesource.com/c/chromium/src/+/7010850 * 7007933: Remove superfluous mojom includes in //content/public headers Refs https://chromium-review.googlesource.com/c/chromium/src/+/7007933 * 7023196: Trim os_crypt/sync visibility list Refs https://chromium-review.googlesource.com/c/chromium/src/+/7023196 * 7008912: Remove GURL::*_piece() method Refs https://chromium-review.googlesource.com/c/chromium/src/+/7008912 * 7003989: Add wrapper struct for CopyFromSurface output Refs https://chromium-review.googlesource.com/c/chromium/src/+/7003989 * 7017889: [MemoryPressureListener] Remove type aliases Refs https://chromium-review.googlesource.com/c/chromium/src/+/7017889 * 7027780: Delete viz::ResourceSizes Refs https://chromium-review.googlesource.com/c/chromium/src/+/7027780 Refs https://chromium-review.googlesource.com/c/chromium/src/+/6989572 * 6495189: [api] Delete old String::Write* APIs Refs https://chromium-review.googlesource.com/c/v8/v8/+/6495189 * chore: update patches * chore: run script/gen-libc++-filenames.js --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
40 lines
1.6 KiB
Diff
40 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Tobias=20Nie=C3=9Fen?= <tniessen@tnie.de>
|
|
Date: Fri, 9 May 2025 04:15:47 +0100
|
|
Subject: src: use String::WriteV2() in TwoByteValue
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Since `String::Write()` is deprecated, use `String::WriteV2()` instead.
|
|
|
|
PR-URL: https://github.com/nodejs/node/pull/58164
|
|
Reviewed-By: Juan José Arboleda <soyjuanarbol@gmail.com>
|
|
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
|
|
Reviewed-By: Yagiz Nizipli <yagiz@nizipli.com>
|
|
Reviewed-By: Daeyeon Jeong <daeyeon.dev@gmail.com>
|
|
Reviewed-By: Gerhard Stöbich <deb2001-github@yahoo.de>
|
|
Reviewed-By: James M Snell <jasnell@gmail.com>
|
|
|
|
diff --git a/src/util.cc b/src/util.cc
|
|
index e616e11107555f0613cb631e3b4320fc281441fa..c5c2b89dc3fc008114b2492d1e16928428f097b4 100644
|
|
--- a/src/util.cc
|
|
+++ b/src/util.cc
|
|
@@ -146,12 +146,10 @@ TwoByteValue::TwoByteValue(Isolate* isolate, Local<Value> value) {
|
|
Local<String> string;
|
|
if (!value->ToString(isolate->GetCurrentContext()).ToLocal(&string)) return;
|
|
|
|
- // Allocate enough space to include the null terminator
|
|
- const size_t storage = string->Length() + 1;
|
|
- AllocateSufficientStorage(storage);
|
|
-
|
|
- const int flags = String::NO_NULL_TERMINATION;
|
|
- const int length = string->Write(isolate, out(), 0, storage, flags);
|
|
+ // Allocate enough space to include the null terminator.
|
|
+ const size_t length = string->Length();
|
|
+ AllocateSufficientStorage(length + 1);
|
|
+ string->WriteV2(isolate, 0, length, out());
|
|
SetLengthAndZeroTerminate(length);
|
|
}
|
|
|