diff options
| author | Michaël Zasso <targos@protonmail.com> | 2018-08-24 11:49:42 +0200 |
|---|---|---|
| committer | Michaël Zasso <targos@protonmail.com> | 2018-08-28 14:11:20 +0200 |
| commit | 08aad66411a11218674f40a393e2af91cc26ee40 (patch) | |
| tree | ad555d7cd37d81e9f8554d270889699605b31d3e /src/string_decoder.cc | |
| parent | 5081d9663f1ce50d733762b64278d99baa810c04 (diff) | |
| download | android-node-v8-08aad66411a11218674f40a393e2af91cc26ee40.tar.gz android-node-v8-08aad66411a11218674f40a393e2af91cc26ee40.tar.bz2 android-node-v8-08aad66411a11218674f40a393e2af91cc26ee40.zip | |
src,deps: add isolate parameter to String::Concat
Partially backport an upstream commit that deprecates String::Concat
without the isolate parameter. This overload has already been removed
in V8 7.0.
PR-URL: https://github.com/nodejs/node/pull/22521
Refs: https://github.com/v8/v8/commit/8a011b57d8b26e9cfe1c20a2ef26adb14be6ecc2
Reviewed-By: Ujjwal Sharma <usharma1998@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Diffstat (limited to 'src/string_decoder.cc')
| -rw-r--r-- | src/string_decoder.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/string_decoder.cc b/src/string_decoder.cc index dcc99a09f9..b75169ff00 100644 --- a/src/string_decoder.cc +++ b/src/string_decoder.cc @@ -226,7 +226,7 @@ MaybeLocal<String> StringDecoder::DecodeData(Isolate* isolate, if (prepend.IsEmpty()) { return body; } else { - return String::Concat(prepend, body); + return String::Concat(isolate, prepend, body); } } else { CHECK(Encoding() == ASCII || Encoding() == HEX || Encoding() == LATIN1); |