This is an archive of the discontinued LLVM Phabricator instance.

Differential D138798

[libc++][NFC] Add assertions before calling memmove
ClosedPublic

Authored by ldionne on Nov 28 2022, 5:40 AM.

Details

Reviewers
ldionne
Group Reviewers
Restricted Project
Commits
rGb95379d20e04: [libc++][NFC] Add assertions before calling memmove
Summary

Since we're checking preconditions for calling memmove, we might
as well do that properly.

Diff Detail

Event Timeline

ldionne created this revision.Nov 28 2022, 5:40 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 28 2022, 5:40 AM
ldionne requested review of this revision.Nov 28 2022, 5:40 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 28 2022, 5:40 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B199733: Diff 478204.Nov 28 2022, 6:55 AM
ldionne accepted this revision.Nov 28 2022, 8:09 AM
This revision is now accepted and ready to land.Nov 28 2022, 8:09 AM
This revision was landed with ongoing or failed builds.Nov 28 2022, 8:10 AM
Closed by commit rGb95379d20e04: [libc++][NFC] Add assertions before calling memmove (authored by ldionne). · Explain Why
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rGb95379d20e04: [libc++][NFC] Add assertions before calling memmove.

Revision Contents

PathSize
libcxx/
include/
3 lines
3 lines

Diff 478247

libcxx/include/fstream

Show First 20 Lines • Show All 748 Lines • ▼ Show 20 Lines if (this->gptr() == this->egptr())
this->eback() + __unget_sz, this->eback() + __unget_sz,
this->eback() + __unget_sz + __nmemb); this->eback() + __unget_sz + __nmemb);
__c = traits_type::to_int_type(*this->gptr()); __c = traits_type::to_int_type(*this->gptr());
} }
} }
else else
{ {
if (__extbufend_ != __extbufnext_) { if (__extbufend_ != __extbufnext_) {
_LIBCPP_ASSERT(__extbufnext_ != nullptr, "underflow moving from NULL" ); _LIBCPP_ASSERT(__extbufnext_ != nullptr, "underflow moving from nullptr");
_LIBCPP_ASSERT(__extbuf_ != nullptr, "underflow moving into nullptr");
_VSTD::memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_); _VSTD::memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);
} }
__extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_); __extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);
__extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_); __extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);
size_t __nmemb = _VSTD::min(static_cast<size_t>(__ibs_ - __unget_sz), size_t __nmemb = _VSTD::min(static_cast<size_t>(__ibs_ - __unget_sz),
static_cast<size_t>(__extbufend_ - __extbufnext_)); static_cast<size_t>(__extbufend_ - __extbufnext_));
codecvt_base::result __r; codecvt_base::result __r;
__st_last_ = __st_; __st_last_ = __st_;
▲ Show 20 Lines • Show All 996 Lines • Show Last 20 Lines

libcxx/include/locale

Show First 20 Lines • Show All 4,008 Lines • ▼ Show 20 Lines if (this->gptr() == this->egptr())
this->eback() + __unget_sz, this->eback() + __unget_sz,
this->eback() + __unget_sz + __nmemb); this->eback() + __unget_sz + __nmemb);
__c = *this->gptr(); __c = *this->gptr();
} }
} }
else else
{ {
if (__extbufend_ != __extbufnext_) { if (__extbufend_ != __extbufnext_) {
_LIBCPP_ASSERT(__extbufnext_ != NULL, "underflow moving from NULL" ); _LIBCPP_ASSERT(__extbufnext_ != nullptr, "underflow moving from nullptr");
_LIBCPP_ASSERT(__extbuf_ != nullptr, "underflow moving into nullptr");
_VSTD::memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_); _VSTD::memmove(__extbuf_, __extbufnext_, __extbufend_ - __extbufnext_);
} }
__extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_); __extbufnext_ = __extbuf_ + (__extbufend_ - __extbufnext_);
__extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_); __extbufend_ = __extbuf_ + (__extbuf_ == __extbuf_min_ ? sizeof(__extbuf_min_) : __ebs_);
streamsize __nmemb = _VSTD::min(static_cast<streamsize>(this->egptr() - this->eback() - __unget_sz), streamsize __nmemb = _VSTD::min(static_cast<streamsize>(this->egptr() - this->eback() - __unget_sz),
static_cast<streamsize>(__extbufend_ - __extbufnext_)); static_cast<streamsize>(__extbufend_ - __extbufnext_));
codecvt_base::result __r; codecvt_base::result __r;
// FIXME: Do we ever need to restore the state here? // FIXME: Do we ever need to restore the state here?
▲ Show 20 Lines • Show All 344 Lines • Show Last 20 Lines