Skip to content

prevector: fix 2 bugs in currently unreached code paths #7888

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
laanwj merged 3 commits into from
Apr 18, 2016
Merged

prevector: fix 2 bugs in currently unreached code paths #7888

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e2c29f
prevector: destroy elements only via erase()
kazcw Apr 13, 2016
4ed41a2
test prevector::swap
kazcw Apr 16, 2016
a7af72a
prevector::swap: fix (unreached) data corruption
kazcw Apr 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
prevector: destroy elements only via erase() 
Fixes a bug in which pop_back did not call the deleted item's destructor.

Using the most general erase() implementation to implement all the others
prevents similar bugs because the coupling between deallocation and destructor
invocation only needs to be maintained in one place.
Also reduces duplication of complex memmove logic.
  • Loading branch information
@kazcw
kazcw committed Apr 16, 2016
commit 1e2c29f2632c378843c5a3c9ad401a7bcacc4de0
12 changes: 4 additions & 8 deletions src/prevector.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,8 @@ class prevector {
}

void resize(size_type new_size) {
while (size() > new_size) {
item_ptr(size() - 1)->~T();
_size--;
if (size() > new_size) {
erase(item_ptr(new_size), end());
}
if (new_size > capacity()) {
change_capacity(new_size);
Expand Down Expand Up @@ -368,10 +367,7 @@ class prevector {
}

iterator erase(iterator pos) {
(*pos).~T();
memmove(&(*pos), &(*pos) + 1, ((char*)&(*end())) - ((char*)(1 + &(*pos))));
_size--;
return pos;
return erase(pos, pos + 1);
}

iterator erase(iterator first, iterator last) {
Expand All @@ -396,7 +392,7 @@ class prevector {
}

void pop_back() {
_size--;
erase(end() - 1, end());
}

T& front() {
Expand Down