Skip to content

fix: use from_borrowed_ptr for Py_None to prevent invalid DECREF #113

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

Merged
awolverp merged 1 commit into from
Oct 28, 2026
Merged

fix: use from_borrowed_ptr for Py_None to prevent invalid DECREF #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/pyclasses/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ impl PyCache {
utils::OptionalArgument::Defined(x) => Ok(x),
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
Ok(pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind())
Ok(pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind())
},
}
}
Expand Down Expand Up @@ -347,7 +347,7 @@ impl PyCache {
utils::OptionalArgument::Defined(x) => x,
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind()
pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind()
},
};

Expand Down
4 changes: 2 additions & 2 deletions src/pyclasses/fifocache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ impl PyFIFOCache {
utils::OptionalArgument::Defined(x) => Ok(x),
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
Ok(pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind())
Ok(pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind())
},
}
}
Expand Down Expand Up @@ -352,7 +352,7 @@ impl PyFIFOCache {
utils::OptionalArgument::Defined(x) => x,
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind()
pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind()
},
};

Expand Down
6 changes: 3 additions & 3 deletions src/pyclasses/lfucache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ impl PyLFUCache {
utils::OptionalArgument::Defined(x) => Ok(x),
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
Ok(pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind())
Ok(pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind())
},
}
}
Expand Down Expand Up @@ -370,7 +370,7 @@ impl PyLFUCache {
utils::OptionalArgument::Defined(x) => x,
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind()
pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind()
},
};

Expand Down Expand Up @@ -717,7 +717,7 @@ impl PyLFUCache {
utils::OptionalArgument::Defined(x) => Ok(x),
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
Ok(pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind())
Ok(pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind())
},
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/pyclasses/lrucache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ impl PyLRUCache {
utils::OptionalArgument::Defined(x) => Ok(x),
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
Ok(pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind())
Ok(pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind())
},
}
}
Expand Down Expand Up @@ -379,7 +379,7 @@ impl PyLRUCache {
utils::OptionalArgument::Defined(x) => x,
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind()
pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind()
},
};

Expand Down Expand Up @@ -704,7 +704,7 @@ impl PyLRUCache {
utils::OptionalArgument::Defined(x) => Ok(x),
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
Ok(pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind())
Ok(pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind())
},
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/pyclasses/rrcache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ impl PyRRCache {
utils::OptionalArgument::Defined(x) => Ok(x),
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
Ok(pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind())
Ok(pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind())
},
}
}
Expand Down Expand Up @@ -350,7 +350,7 @@ impl PyRRCache {
utils::OptionalArgument::Defined(x) => x,
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind()
pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind()
},
};

Expand Down
6 changes: 3 additions & 3 deletions src/pyclasses/ttlcache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ impl PyTTLCache {
utils::OptionalArgument::Defined(x) => Ok(x),
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
Ok(pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind())
Ok(pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind())
},
}
}
Expand Down Expand Up @@ -355,7 +355,7 @@ impl PyTTLCache {
utils::OptionalArgument::Defined(x) => x,
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind()
pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind()
},
};

Expand Down Expand Up @@ -745,7 +745,7 @@ impl PyTTLCache {
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
Ok((
pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind(),
pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind(),
0.0,
))
},
Expand Down
6 changes: 3 additions & 3 deletions src/pyclasses/vttlcache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ impl PyVTTLCache {
utils::OptionalArgument::Defined(x) => Ok(x),
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
Ok(pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind())
Ok(pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind())
},
}
}
Expand Down Expand Up @@ -336,7 +336,7 @@ impl PyVTTLCache {
utils::OptionalArgument::Defined(x) => x,
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind()
pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind()
},
};

Expand Down Expand Up @@ -690,7 +690,7 @@ impl PyVTTLCache {
utils::OptionalArgument::Undefined => unsafe {
// SAFETY: None is immortal, so reference counting has no meaning
Ok((
pyo3::Bound::from_owned_ptr(py, pyo3::ffi::Py_None()).unbind(),
pyo3::Bound::from_borrowed_ptr(py, pyo3::ffi::Py_None()).unbind(),
py.None(),
))
},
Expand Down
13 changes: 13 additions & 0 deletions tests/mixins.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1095,6 +1095,19 @@ def test_concurrent_inserts_with_finalizers(self):
done.stderr or f"exit code {done.returncode}"
)

def test_none_refcount(self):
cache = self.create_cache(1000)

if isinstance(cache, cachebox.Cache):
pytest.skip()

for i in range(10_000):
cache[i] = None

for i in range(10_000):
v = cache.get(i)
assert v is None


class SweepIntervalMixin(BaseMixin):
def _create_sweep_cache(
Expand Down
Loading