Skip to content

Fix using grow to the same size. - #151

Merged
bors-servo merged 1 commit into
servo:masterfrom
ehuss:grow-same-size
Jun 8, 2019
Merged

Fix using grow to the same size.#151
bors-servo merged 1 commit into
servo:masterfrom
ehuss:grow-same-size

Conversation

@ehuss

@ehuss ehuss commented Jun 6, 2019

Copy link
Copy Markdown
Contributor

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

emilio commented Jun 7, 2019

Copy link
Copy Markdown
Member

@bors-servo r+

@bors-servo

Copy link
Copy Markdown
Contributor

📌 Commit 3cfc46a has been approved by emilio

@bors-servo

Copy link
Copy Markdown
Contributor

🔒 Merge conflict

@bors-servo

Copy link
Copy Markdown
Contributor

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

@ehuss
ehuss force-pushed the grow-same-size branch from 3cfc46a to b28c6b3 Compare June 7, 2019 12:33
@emilio

emilio commented Jun 8, 2019

Copy link
Copy Markdown
Member

@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
Copy Markdown
Contributor

📌 Commit b28c6b3 has been approved by emilio

@bors-servo

Copy link
Copy Markdown
Contributor

🔒 Merge conflict

@bors-servo

Copy link
Copy Markdown
Contributor

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

@ehuss
ehuss force-pushed the grow-same-size branch from b28c6b3 to 4ba0d0f Compare June 8, 2019 01:30
@ehuss

ehuss commented Jun 8, 2019

Copy link
Copy Markdown
Contributor Author

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

@jdm

jdm commented Jun 8, 2019

Copy link
Copy Markdown
Member

@bors-servo r+

@bors-servo

Copy link
Copy Markdown
Contributor

📌 Commit 4ba0d0f has been approved by jdm

bors-servo pushed a commit that referenced this pull request Jun 8, 2019
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
Copy Markdown
Contributor

⌛ Testing commit 4ba0d0f with merge c20cfa8...

@bors-servo

Copy link
Copy Markdown
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
@jdm jdm mentioned this pull request Jun 10, 2019
bors-servo pushed a commit that referenced this pull request Jun 10, 2019
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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

use-after-free when growing to the same size

4 participants