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

src: use single ObjectTemplate for TextDecoder · nodejs/node@e9e12b8 · GitHub

/ node Public

Commit e9e12b8

Browse files
addaleax
authored and
MylesBorins
committed
src: use single ObjectTemplate for TextDecoder
`ObjectTemplate`s are not garbage-collected like regular objects (for some reason). It is sufficient to create a single template anyway, so do that to address the memory leak. Fixes: #32424 PR-URL: #32426 Reviewed-By: Gus Caplan <me@gus.host> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
1 parent 28e298f commit e9e12b8

3 files changed

Lines changed: 20 additions & 4 deletions

File tree

‎src/env.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,7 @@ constexpr size_t kFsStatsBufferLength =
411411
V(http2settings_constructor_template, v8::ObjectTemplate) \
412412
V(http2stream_constructor_template, v8::ObjectTemplate) \
413413
V(http2ping_constructor_template, v8::ObjectTemplate) \
414+
V(i18n_converter_template, v8::ObjectTemplate) \
414415
V(libuv_stream_wrap_ctor_template, v8::FunctionTemplate) \
415416
V(message_port_constructor_template, v8::FunctionTemplate) \
416417
V(pipe_constructor_template, v8::FunctionTemplate) \

‎src/node_i18n.cc‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ namespace node {
8686

8787
using v8::Context;
8888
using v8::FunctionCallbackInfo;
89+
using v8::FunctionTemplate;
8990
using v8::HandleScope;
9091
using v8::Int32;
9192
using v8::Isolate;
@@ -171,8 +172,7 @@ class ConverterObject : public BaseObject, Converter {
171172
Environment* env = Environment::GetCurrent(args);
172173
HandleScope scope(env->isolate());
173174

174-
Local<ObjectTemplate> t = ObjectTemplate::New(env->isolate());
175-
t->SetInternalFieldCount(ConverterObject::kInternalFieldCount);
175+
Local<ObjectTemplate> t = env->i18n_converter_template();
176176
Local<Object> obj;
177177
if (!t->NewInstance(env->context()).ToLocal(&obj)) return;
178178

@@ -821,6 +821,16 @@ void Initialize(Local<Object> target,
821821
env->SetMethod(target, "transcode", Transcode);
822822

823823
// ConverterObject
824+
{
825+
Local<FunctionTemplate> t = FunctionTemplate::New(env->isolate());
826+
t->InstanceTemplate()->SetInternalFieldCount(
827+
ConverterObject::kInternalFieldCount);
828+
Local<String> converter_string =
829+
FIXED_ONE_BYTE_STRING(env->isolate(), "Converter");
830+
t->SetClassName(converter_string);
831+
env->set_i18n_converter_template(t->InstanceTemplate());
832+
}
833+
824834
env->SetMethod(target, "getConverter", ConverterObject::Create);
825835
env->SetMethod(target, "decode", ConverterObject::Decode);
826836
env->SetMethod(target, "hasConverter", ConverterObject::Has);

‎test/parallel/test-whatwg-encoding-custom-textdecoder.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,13 @@ if (common.hasIntl) {
107107
if (common.hasIntl) {
108108
assert.strictEqual(
109109
util.inspect(dec, { showHidden: true }),
110-
'TextDecoder {\n encoding: \'utf-8\',\n fatal: false,\n ' +
111-
'ignoreBOM: true,\n [Symbol(flags)]: 4,\n [Symbol(handle)]: {}\n}'
110+
'TextDecoder {\n' +
111+
' encoding: \'utf-8\',\n' +
112+
' fatal: false,\n' +
113+
' ignoreBOM: true,\n' +
114+
' [Symbol(flags)]: 4,\n' +
115+
' [Symbol(handle)]: Converter {}\n' +
116+
'}'
112117
);
113118
} else {
114119
assert.strictEqual(

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL