generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix use after free and calls to operator comma in debug mode

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@232703 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Fiselier 2015-03-19 03:20:02 +00:00
parent 71aa376ede
commit 537876b98e
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/list
View File

@ -1480,7 +1480,7 @@ list<_Tp, _Alloc>::insert(const_iterator __p, _InpIter __f, _InpIter __l,
try try
{ {
#endif // _LIBCPP_NO_EXCEPTIONS #endif // _LIBCPP_NO_EXCEPTIONS
for (++__f; __f != __l; ++__f, ++__e, ++__ds) for (++__f; __f != __l; ++__f, (void) ++__e, (void) ++__ds)
{ {
__hold.reset(__node_alloc_traits::allocate(__na, 1)); __hold.reset(__node_alloc_traits::allocate(__na, 1));
__node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), *__f); __node_alloc_traits::construct(__na, _VSTD::addressof(__hold->__value_), *__f);

2
src/debug.cpp
View File

@ -214,10 +214,10 @@ __libcpp_db::__erase_i(void* __i)
else else
q->__next_ = p->__next_; q->__next_ = p->__next_;
__c_node* c = p->__c_; __c_node* c = p->__c_;
free(p);
--__isz_; --__isz_;
if (c != nullptr) if (c != nullptr)
c->__remove(p); c->__remove(p);
free(p);
} }
} }
} }