Mercurial > hg
diff rust/hg-cpython/src/dirstate/dirstate_map.rs @ 42846:01d3ce3281cf
rust-cpython: fix unsafe inner(py).borrow_mut() calls
Since self.inner is managed by PySharedState, it must not be borrowed
mutably through the RefCell interface. Otherwise, the underlying object
could be mutated while a reference is leaked to Python world.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Sun, 01 Sep 2019 17:35:14 +0900 |
parents | 2e1f74cc3350 |
children | 8db8fa1de2ef |
line wrap: on
line diff
--- a/rust/hg-cpython/src/dirstate/dirstate_map.rs Mon Sep 02 16:28:43 2019 +0200 +++ b/rust/hg-cpython/src/dirstate/dirstate_map.rs Sun Sep 01 17:35:14 2019 +0900 @@ -169,8 +169,7 @@ Ok(filename?.extract::<PyBytes>(py)?.data(py).to_owned()) }) .collect(); - self.inner(py) - .borrow_mut() + self.borrow_mut(py)? .clear_ambiguous_times(files?, now.extract(py)?); Ok(py.None()) } @@ -205,25 +204,20 @@ def hastrackeddir(&self, d: PyObject) -> PyResult<PyBool> { let d = d.extract::<PyBytes>(py)?; - Ok(self - .inner(py) - .borrow_mut() + Ok(self.borrow_mut(py)? .has_tracked_dir(d.data(py)) .to_py_object(py)) } def hasdir(&self, d: PyObject) -> PyResult<PyBool> { let d = d.extract::<PyBytes>(py)?; - Ok(self - .inner(py) - .borrow_mut() + Ok(self.borrow_mut(py)? .has_dir(d.data(py)) .to_py_object(py)) } def parents(&self, st: PyObject) -> PyResult<PyTuple> { - self.inner(py) - .borrow_mut() + self.borrow_mut(py)? .parents(st.extract::<PyBytes>(py)?.data(py)) .and_then(|d| { Ok((PyBytes::new(py, &d.p1), PyBytes::new(py, &d.p2)) @@ -241,16 +235,13 @@ let p1 = extract_node_id(py, &p1)?; let p2 = extract_node_id(py, &p2)?; - self.inner(py) - .borrow_mut() + self.borrow_mut(py)? .set_parents(&DirstateParents { p1, p2 }); Ok(py.None()) } def read(&self, st: PyObject) -> PyResult<Option<PyObject>> { - match self - .inner(py) - .borrow_mut() + match self.borrow_mut(py)? .read(st.extract::<PyBytes>(py)?.data(py)) { Ok(Some(parents)) => Ok(Some( @@ -353,7 +344,7 @@ def getdirs(&self) -> PyResult<Dirs> { // TODO don't copy, share the reference - self.inner(py).borrow_mut().set_dirs(); + self.borrow_mut(py)?.set_dirs(); Dirs::from_inner( py, DirsMultiset::from_dirstate( @@ -364,7 +355,7 @@ } def getalldirs(&self) -> PyResult<Dirs> { // TODO don't copy, share the reference - self.inner(py).borrow_mut().set_all_dirs(); + self.borrow_mut(py)?.set_all_dirs(); Dirs::from_inner( py, DirsMultiset::from_dirstate( @@ -422,8 +413,7 @@ ) -> PyResult<PyObject> { let key = key.extract::<PyBytes>(py)?; let value = value.extract::<PyBytes>(py)?; - self.inner(py) - .borrow_mut() + self.borrow_mut(py)? .copy_map .insert(key.data(py).to_vec(), value.data(py).to_vec()); Ok(py.None()) @@ -434,7 +424,7 @@ default: Option<PyObject> ) -> PyResult<Option<PyObject>> { let key = key.extract::<PyBytes>(py)?; - match self.inner(py).borrow_mut().copy_map.remove(key.data(py)) { + match self.borrow_mut(py)?.copy_map.remove(key.data(py)) { Some(_) => Ok(None), None => Ok(default), }