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 <[email protected]> PR-URL: #39737 Reviewed-By: Robert Nagy <[email protected]> Reviewed-By: Matteo Collina <[email protected]>
nodejs · Sep 4, 2021 · c4686fa · c4686fa
1 parent f8fee44
commit c4686fa
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/src/node_i18n.cc b/src/node_i18n.cc
@@ -441,11 +441,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.