Skip to content

fix: prevent panic in cache reset methods when cache is None #1337

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

Open
saschabuehrle wants to merge 1 commit into
base: master
Choose a base branch
from
+15 −3
Open

fix: prevent panic in cache reset methods when cache is None #1337

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
18 changes: 15 additions & 3 deletions regex-automata/src/meta/wrappers.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,11 @@ impl OnePassCache {
pub(crate) fn reset(&mut self, builder: &OnePass) {
#[cfg(feature = "dfa-onepass")]
if let Some(ref e) = builder.0 {
self.0.as_mut().unwrap().reset(&e.0);
if let Some(ref mut cache) = self.0 {
cache.reset(&e.0);
} else {
self.0 = Some(e.0.create_cache());
}
}
}

Expand Down Expand Up @@ -781,7 +785,11 @@ impl HybridCache {
pub(crate) fn reset(&mut self, builder: &Hybrid) {
#[cfg(feature = "hybrid")]
if let Some(ref e) = builder.0 {
self.0.as_mut().unwrap().reset(&e.0);
if let Some(ref mut cache) = self.0 {
cache.reset(&e.0);
} else {
self.0 = Some(e.0.create_cache());
}
}
}

Expand Down Expand Up @@ -1186,7 +1194,11 @@ impl ReverseHybridCache {
pub(crate) fn reset(&mut self, builder: &ReverseHybrid) {
#[cfg(feature = "hybrid")]
if let Some(ref e) = builder.0 {
self.0.as_mut().unwrap().reset(&e.0);
if let Some(ref mut cache) = self.0 {
cache.reset(&e.0);
} else {
self.0 = Some(e.0.create_cache());
}
}
}

Expand Down