From ec22e35e6943a9ae3fa399dd14ec1bc5b28c90cb Mon Sep 17 00:00:00 2001 From: Marshall Clow Date: Tue, 23 Oct 2018 20:07:45 +0000 Subject: [PATCH] Off-by-one errors strike again. Thank goodness for ASAN and the bots. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@345076 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/vector | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/include/vector b/include/vector index 8ac7576ae..196ea70ea 100644 --- a/include/vector +++ b/include/vector @@ -2606,8 +2606,13 @@ vector::__construct_at_end(size_type __n, bool __x) { size_type __old_size = this->__size_; this->__size_ += __n; - if (__old_size == 0 || (__old_size / __bits_per_word) != (this->__size_ / __bits_per_word)) - this->__begin_[this->__size_ / __bits_per_word] = __storage_type(0); + if (__old_size == 0 || ((__old_size - 1) / __bits_per_word) != ((this->__size_ - 1) / __bits_per_word)) + { + if (this->__size_ <= __bits_per_word) + this->__begin_[0] = __storage_type(0); + else + this->__begin_[(this->__size_ - 1) / __bits_per_word] = __storage_type(0); + } _VSTD::fill_n(__make_iter(__old_size), __n, __x); } @@ -2622,8 +2627,13 @@ vector::__construct_at_end(_ForwardIterator __first, _ForwardI { size_type __old_size = this->__size_; this->__size_ += _VSTD::distance(__first, __last); - if (__old_size == 0 || (__old_size / __bits_per_word) != (this->__size_ / __bits_per_word)) - this->__begin_[this->__size_ / __bits_per_word] = __storage_type(0); + if (__old_size == 0 || ((__old_size - 1) / __bits_per_word) != ((this->__size_ - 1) / __bits_per_word)) + { + if (this->__size_ <= __bits_per_word) + this->__begin_[0] = __storage_type(0); + else + this->__begin_[(this->__size_ - 1) / __bits_per_word] = __storage_type(0); + } _VSTD::copy(__first, __last, __make_iter(__old_size)); }