From 409ee28095ef5582135e3d07cd5066b60f6e1ab1 Mon Sep 17 00:00:00 2001 From: tabudz Date: Mon, 2 Jun 2025 02:15:34 +0800 Subject: [PATCH] Re-sync with internal repository (#772) Co-authored-by: Facebook Community Bot <6422482+facebook-github-bot@users.noreply.github.com> --- lib/llvm/Support/SmallVector.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lib/llvm/Support/SmallVector.cpp b/lib/llvm/Support/SmallVector.cpp index 1070c667..3aab1543 100644 --- a/lib/llvm/Support/SmallVector.cpp +++ b/lib/llvm/Support/SmallVector.cpp @@ -42,13 +42,16 @@ static_assert(sizeof(SmallVector) == /// on POD-like datatypes and is out of line to reduce code duplication. void SmallVectorBase::grow_pod(void *FirstEl, size_t MinCapacity, size_t TSize) { - // Ensure we can fit the new capacity in 32 bits. - if (MinCapacity > UINT32_MAX) - report_bad_alloc_error("SmallVector capacity overflow during allocation"); + constexpr size_t MinGrowth = 1; + size_t NewCapacity = 2 * capacity() + MinGrowth; // Always grow. + NewCapacity = static_cast(std::max(NewCapacity, MinCapacity)); - size_t NewCapacity = 2 * capacity() + 1; // Always grow. - NewCapacity = - std::min(std::max(NewCapacity, MinCapacity), size_t(UINT32_MAX)); + // Ensure that NewCapacity did not overflow an unsigned int, + // and that the capacity in bytes will not overflow a size_t. + if (NewCapacity <= this->capacity() || + NewCapacity < MinCapacity || + NewCapacity > size_t(-1) / TSize) + report_bad_alloc_error("SmallVector capacity overflow during allocation"); void *NewElts; if (BeginX == FirstEl) {