diff options
author | James M Snell <jasnell@gmail.com> | 2021-08-11 18:55:28 +0300 |
---|---|---|
committer | James M Snell <jasnell@gmail.com> | 2021-08-14 01:16:46 +0300 |
commit | 394c99118d372ce1f35911202a0ccd75d60a45b7 (patch) | |
tree | 75ea20f93830dbd9df6feb118c3625c426a66f77 /src/node_i18n.cc | |
parent | 1150cfe6ebf44541581e87682141905b6750439f (diff) |
src: fix TextDecoder final flush size calculation
Flushing a TextDecoder with a zero-sized input and pending
incomplete characters was failing when fatal: false.
Signed-off-by: James M Snell <jasnell@gmail.com>
PR-URL: https://github.com/nodejs/node/pull/39737
Reviewed-By: Robert Nagy <ronagy@icloud.com>
Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Diffstat (limited to 'src/node_i18n.cc')
-rw-r--r-- | src/node_i18n.cc | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/node_i18n.cc b/src/node_i18n.cc index 8a08a95bf75..b1b3f5d1749 100644 --- a/src/node_i18n.cc +++ b/src/node_i18n.cc @@ -442,11 +442,24 @@ void ConverterObject::Decode(const FunctionCallbackInfo<Value>& args) { UErrorCode status = U_ZERO_ERROR; MaybeStackBuffer<UChar> result; MaybeLocal<Object> ret; - size_t limit = converter->min_char_size() * input.length(); + + UBool flush = (flags & CONVERTER_FLAGS_FLUSH) == CONVERTER_FLAGS_FLUSH; + + // When flushing the final chunk, the limit is the maximum + // of either the input buffer length or the number of pending + // characters times the min char size. + size_t limit = converter->min_char_size() * + (!flush ? + input.length() : + std::max( + input.length(), + static_cast<size_t>( + ucnv_toUCountPending(converter->conv(), &status)))); + status = U_ZERO_ERROR; + if (limit > 0) result.AllocateSufficientStorage(limit); - UBool flush = (flags & CONVERTER_FLAGS_FLUSH) == CONVERTER_FLAGS_FLUSH; auto cleanup = OnScopeLeave([&]() { if (flush) { // Reset the converter state. |