Skip to content
New issue

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

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

Already on GitHub? # to your account

algorithmica: 'merge_sort::merge()' crashes with double-free for T: Drop #872

Merged
merged 1 commit into from
Apr 15, 2021
Merged

algorithmica: 'merge_sort::merge()' crashes with double-free for T: Drop #872

merged 1 commit into from
Apr 15, 2021

Conversation

JOE1994
Copy link
Contributor

@JOE1994 JOE1994 commented Apr 15, 2021

Original issue report: AbrarNitk/algorithmica#1

Thank you for reviewing this PR :)

@Shnatsel Shnatsel merged commit c9b5bbd into rustsec:master Apr 15, 2021
@Shnatsel
Copy link
Member

Thanks!

@Shnatsel
Copy link
Member

@tarcieri looks like the ID assignment is not running on main, and the force push is not triggered either. How is the automation is set up with master vs main?

@tarcieri
Copy link
Member

tarcieri commented Apr 15, 2021

master is set up as a (hopefully temporary) mirror of main:

https://github.com/RustSec/advisory-db/blob/master/.github/workflows/mirror-main-to-master.yml

PRs shouldn't be merged to master. They'll get clobbered.

I used the rename branch feature of GitHub which should've reparented all open PRs to main. I guess keep an eye out for PRs opened against master.

If there are commits merged to master that aren't on main, they need to be cherry-picked.

@Shnatsel
Copy link
Member

Oh, I was hoping to use master as a staging branch and only mirror it to main once the IDs are assigned, so that RUSTSEC-0000-0000 IDs are not visible to clients at all. And that way we'd mirror from master to main, conditionally.

@tarcieri
Copy link
Member

tarcieri commented Apr 15, 2021

That'd be a pretty big change from how things work now. I'd prefer to get rid of the master branch entirely (see #312)

Also the client library already ignores RUSTSEC-0000-0000.

If you'd like to do something like that, I'd suggest opening a discussion issue and we can plan it out.

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants