Merge branch 'gix-config-fix'

Author: Byron

gix-config/src/value/normalize.rs

@@ -54,27 +54,27 @@ use bstr::{BStr, BString, ByteSlice};
 /// assert_eq!(normalize_bstr(r#"hello "world\"""#), Cow::<BStr>::Owned(BString::from(r#"hello world""#)));
 /// ```
 #[must_use]
-pub fn normalize(input: Cow<'_, BStr>) -> Cow<'_, BStr> {
+pub fn normalize(mut input: Cow<'_, BStr>) -> Cow<'_, BStr> {
     if input.as_ref() == "\"\"" {
         return Cow::Borrowed("".into());
     }
-
-    let size = input.len();
-    if size >= 3 && input[0] == b'"' && input[size - 1] == b'"' && input[size - 2] != b'\\' {
-        match input {
-            Cow::Borrowed(input) => return normalize_bstr(&input[1..size - 1]),
-            Cow::Owned(mut input) => {
+    // An optimization to strip enclosing quotes without producing a new value/copy it.
+    while input.len() >= 3 && input[0] == b'"' && input[input.len() - 1] == b'"' && input[input.len() - 2] != b'\\' {
+        match &mut input {
+            Cow::Borrowed(input) => *input = &input[1..input.len() - 1],
+            Cow::Owned(input) => {
                 input.pop();
                 input.remove(0);
-                return normalize_bstring(input);
             }
         }
+        if input.as_ref() == "\"\"" {
+            return Cow::Borrowed("".into());
+        }
     }
 
-    if input.find_byteset(b"\\\"").is_none() {
+    if input.find_byteset(br#"\""#).is_none() {
         return input;
     }
-
     let mut out: BString = Vec::with_capacity(input.len()).into();
     let mut bytes = input.iter().copied();
     while let Some(c) = bytes.next() {

gix-config/tests/file/mod.rs

@@ -1,6 +1,7 @@
 use std::borrow::Cow;
 
 use bstr::{BStr, ByteSlice};
+use gix_config::File;
 
 pub fn cow_str(s: &str) -> Cow<'_, BStr> {
     Cow::Borrowed(s.as_bytes().as_bstr())
@@ -25,6 +26,23 @@ mod open {
     }
 }
 
+#[test]
+fn fuzzed() {
+    let file = File::from_bytes_no_includes(
+        include_bytes!("../fixtures/fuzzed/stackoverflow-01.config"),
+        gix_config::file::Metadata::default(),
+        Default::default(),
+    )
+    .unwrap();
+    for section in file.sections() {
+        for key in section.keys() {
+            section
+                .value_implicit(key.as_ref())
+                .expect("The key exists, so should the value.");
+        }
+    }
+}
+
 mod access;
 mod impls;
 mod init;