Off-by-one errors strike again. Thank goodness for ASAN and the bots.
llvm-svn: 345076
Cr-Mirrored-From: sso://chromium.googlesource.com/_direct/external/github.com/llvm/llvm-project
Cr-Mirrored-Commit: 5ac28a0cfda2c5f620886ace6f3b882e2e9a571d
diff --git a/include/vector b/include/vector
index 8ac7576..196ea70 100644
--- a/include/vector
+++ b/include/vector
@@ -2606,8 +2606,13 @@
{
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 @@
{
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));
}