Follow up fix for len wiretype fix

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "sunlight"
-version = "0.1.3"
+version = "0.1.4"
 edition = "2024"
 license = "MIT"
 repository = "https://github.com/puffyCid/sunlight"

src/tags/length.rs

@@ -1,29 +1,14 @@
 use crate::{
-    tags::parser::parse_tag,
-    utils::{
-        encoding::base64_encode_standard,
-        nom_helper::{Endian, nom_unsigned_one_byte},
-        strings::extract_utf8_string,
-    },
+    tags::{parser::parse_tag, var::parse_var_len},
+    utils::{encoding::base64_encode_standard, strings::extract_utf8_string},
 };
 use nom::bytes::complete::take;
 use serde_json::Value;
 
 /// Parse length based tags. The value can be either a string or nested object (sub-message)
 pub(crate) fn parse_length_tag(data: &[u8]) -> nom::IResult<&[u8], Value> {
-    let (mut input, value_byte) = nom_unsigned_one_byte(data, Endian::Le)?;
-    let mut value_length = value_byte as usize;
-    let mut check_msb = value_length;
-
-    // Handle values larger than u8 byte size
-    while (check_msb >> 7) & 1 != 0 {
-        let (remaining, check) = nom_unsigned_one_byte(input, Endian::Le)?;
-        value_length *= check as usize;
-
-        check_msb = check as usize;
-        input = remaining;
-    }
-    let (input, value) = take(value_length)(input)?;
+    let (input, value_length) = parse_var_len(data)?;
+    let (input, value) = take(value_length as usize)(input)?;
 
     // Try string parsing first
     let message = extract_utf8_string(value);

src/tags/var.rs

@@ -3,6 +3,11 @@ use serde_json::Value;
 
 /// Parse var based tags. Will be a number representing one of: int32, int64, uint32, uint64, sint32, sint64, bool, or enum
 pub(crate) fn parse_var(data: &[u8]) -> nom::IResult<&[u8], Value> {
+    let (proto_data, value) = parse_var_len(data)?;
+    Ok((proto_data, Value::Number(value.into())))
+}
+
+pub(crate) fn parse_var_len(data: &[u8]) -> nom::IResult<&[u8], isize> {
     let mut proto_data = data;
     let mut var_value: isize = 0;
 
@@ -20,7 +25,8 @@ pub(crate) fn parse_var(data: &[u8]) -> nom::IResult<&[u8], Value> {
             break;
         }
     }
-    Ok((proto_data, Value::Number(var_value.into())))
+
+    Ok((proto_data, var_value))
 }
 
 #[cfg(test)]

tests/proto_parser.rs

@@ -28,5 +28,34 @@ fn test_protobuf_parser() {
             .as_number()
             .unwrap(),
         json!(4099380458 as u32).as_number().unwrap()
-    )
+    );
+}
+
+#[test]
+fn test_protobuf_parser_coalitions() {
+    let mut test_location = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+    test_location.push("tests/test_data/stats/coalitions.raw");
+    let bytes = read(test_location.to_str().unwrap()).unwrap();
+
+    let value = extract_protobuf(&bytes).unwrap();
+    assert_eq!(value.len(), 7);
+    assert_eq!(
+        value.get(&62).unwrap().value.as_array().unwrap().len(),
+        1271
+    );
+
+    assert_eq!(
+        value.get(&62).unwrap().value.as_array().unwrap()[252]
+            .as_object()
+            .unwrap()
+            .get("7")
+            .unwrap()
+            .as_object()
+            .unwrap()
+            .get("value")
+            .unwrap()
+            .as_str()
+            .unwrap(),
+        json!("com.apple.localizationswitcherd").as_str().unwrap()
+    );
 }