Defensive coding practices sponsored by MtnDustin

microsoft · Mar 14, 2023 · bfb11cd · bfb11cd
1 parent 470b02c
commit bfb11cd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/host/readDataCooked.cpp b/src/host/readDataCooked.cpp
@@ -1050,7 +1050,7 @@ void COOKED_READ_DATA::SavePendingInput(const size_t index, const bool multiline
         const auto inputSizeAfter = input.size();
         const auto amountConsumed = inputSizeBefore - inputSizeAfter;
         input = { _backupLimit, _bytesRead / sizeof(wchar_t) };
-        input = input.substr(amountConsumed);
+        input = input.substr(std::min(input.size(), amountConsumed));
         GetInputReadHandleData()->SaveMultilinePendingInput(input);
     }
     else if (!input.empty())

diff --git a/src/host/stream.cpp b/src/host/stream.cpp
@@ -308,7 +308,7 @@ try
     {
         const auto inputSizeAfter = input.size();
         const auto amountConsumed = inputSizeBefore - inputSizeAfter;
-        input = pending.substr(amountConsumed);
+        input = pending.substr(std::min(pending.size(), amountConsumed));
     }
 
     if (input.empty())