Skip to content
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

Jump to bottom

Fix using grow to the same size. #151

Merged
merged 1 commit into from Jun 8, 2019
Merged

Fix using grow to the same size. #151

merged 1 commit into from Jun 8, 2019

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Jun 6, 2019 •
edited by larsbergstrom

Using grow on a spilled SmallVec to the current capacity would free the backing storage when it shouldn't.

Fixes #148

This change is Reviewable

@emilio
Copy link
Member

emilio commented Jun 7, 2019

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 3cfc46a has been approved by emilio

@bors-servo
Copy link
Contributor

🔒 Merge conflict

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #152) made this pull request unmergeable. Please resolve the merge conflicts.

@emilio
Copy link
Member

emilio commented Jun 8, 2019

@bors-servo r+

Do you need a release after your fixes?

Also, thanks for the patch, and sorry I misunderstood #147 initially, I thought that a rustc update was breaking when compiling SmallVec, not the other way around!

Thanks for all the fixes, very welcome :)

@bors-servo
Copy link
Contributor

📌 Commit b28c6b3 has been approved by emilio

@bors-servo
Copy link
Contributor

🔒 Merge conflict

@bors-servo
Copy link
Contributor

☔ The latest upstream changes (presumably #150) made this pull request unmergeable. Please resolve the merge conflicts.

@ehuss
Copy link
Contributor Author

ehuss commented Jun 8, 2019

Yea, if you could make a new release, I'd appreciate it.

@jdm
Copy link
Member

jdm commented Jun 8, 2019

@bors-servo r+

@bors-servo
Copy link
Contributor

📌 Commit 4ba0d0f has been approved by jdm

bors-servo pushed a commit that referenced this pull request Jun 8, 2019
Auto merge of #151 - ehuss:grow-same-size, r=jdm
c20cfa8 
Fix using `grow` to the same size.

Using `grow` on a spilled SmallVec to the current capacity would free the backing storage when it shouldn't.

Fixes #148

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-smallvec/151)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

⌛ Testing commit 4ba0d0f with merge c20cfa8...

@bors-servo
Copy link
Contributor

☀️ Test successful - checks-travis
Approved by: jdm
Pushing c20cfa8 to master...

@bors-servo bors-servo merged commit 4ba0d0f into servo:master Jun 8, 2019
@alexcrichton alexcrichton mentioned this pull request Jun 10, 2019
Closed
@jdm jdm mentioned this pull request Jun 10, 2019
Merged
bors-servo pushed a commit that referenced this pull request Jun 10, 2019
Auto merge of #153 - servo:jdm-patch-1, r=Manishearth
830d32b 
Publish 0.6.10.

This incorporates #144, #152, #150, and #151, which should all be minor version updates according to semver.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-smallvec/153)
<!-- Reviewable:end -->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@emilio emilio emilio approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

use-after-free when growing to the same size
4 participants
@ehuss @emilio @bors-servo @jdm