Skip to content

Commit f71b37b

Browse files
committed
Auto merge of #44802 - sfackler:vecdeque-oob, r=Gankro
Fix capacity comparison in reserve You can otherwise end up in a situation where you don't actually resize but still call into handle_cap_increase which then corrupts head/tail. Closes #44800 Not totally sure the right way to write a test for this - there are some debug asserts the old bad behavior will hit but we don't build the stdlib with debug assertions by default. r? @gankro
2 parents d4da744 + 81bac74 commit f71b37b

File tree

2 files changed

+26
-1
lines changed

2 files changed

+26
-1
lines changed

src/liballoc/vec_deque.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ impl<T> VecDeque<T> {
558558
.and_then(|needed_cap| needed_cap.checked_next_power_of_two())
559559
.expect("capacity overflow");
560560

561-
if new_cap > self.capacity() {
561+
if new_cap > old_cap {
562562
self.buf.reserve_exact(used_cap, new_cap - used_cap);
563563
unsafe {
564564
self.handle_cap_increase(old_cap);
+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(global_allocator, alloc_system, allocator_api)]
12+
extern crate alloc_system;
13+
14+
use std::collections::VecDeque;
15+
use alloc_system::System;
16+
17+
#[global_allocator]
18+
static ALLOCATOR: System = System;
19+
20+
fn main() {
21+
let mut deque = VecDeque::with_capacity(32);
22+
deque.push_front(0);
23+
deque.reserve(31);
24+
deque.push_back(0);
25+
}

0 commit comments

Comments
 (0)