Merge branch 'fix-config'

Byron · Byron · commit 7ddf948302c4 · 2023-12-26T10:12:18.000+01:00
diff --git a/gix-config-value/src/integer.rs b/gix-config-value/src/integer.rs
@@ -67,6 +67,11 @@ impl TryFrom<&BStr> for Integer {
             return Err(int_err(s));
         }
 
+        let last_idx = s.len() - 1;
+        if !s.is_char_boundary(last_idx) {
+            return Err(int_err(s));
+        }
+
         let (number, suffix) = s.split_at(s.len() - 1);
         if let (Ok(value), Ok(suffix)) = (number.parse(), suffix.parse()) {
             Ok(Self {
diff --git a/gix-config-value/tests/value/integer.rs b/gix-config-value/tests/value/integer.rs
@@ -53,6 +53,7 @@ fn invalid_from_str() {
     assert!(Integer::try_from(b("g")).is_err());
     assert!(Integer::try_from(b("123123123123123123123123")).is_err());
     assert!(Integer::try_from(b("gg")).is_err());
+    assert!(Integer::try_from(b("™️🤦‍♂️")).is_err());
 }
 
 #[test]
diff --git a/gix-config/fuzz/fuzz_targets/fuzz_file.rs b/gix-config/fuzz/fuzz_targets/fuzz_file.rs
@@ -8,8 +8,6 @@ use gix_config::{
     File,
 };
 use libfuzzer_sys::fuzz_target;
-use std::error::Error;
-use std::fmt;
 use std::hint::black_box;
 
 #[derive(Arbitrary, Debug)]

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ fn invalid_from_str() {`
`53`	`53`	`assert!(Integer::try_from(b("g")).is_err());`
`54`	`54`	`assert!(Integer::try_from(b("123123123123123123123123")).is_err());`
`55`	`55`	`assert!(Integer::try_from(b("gg")).is_err());`
	`56`	`+ assert!(Integer::try_from(b("™️🤦‍♂️")).is_err());`
`56`	`57`	`}`
`57`	`58`
`58`	`59`	`#[test]`