Merge branch 'fix-f-drive-parity'

Author: githubrobbi

crates/uffs-mft/src/index/builder.rs

@@ -465,17 +465,17 @@ impl MftIndex {
         tracing::debug!("[TRIP] MftIndex::from_parsed_records -> Phase 2: ExtensionIndex::build");
         index.extension_index = Some(ExtensionIndex::build(&index));
 
-        // 2. Compute tree metrics for directory statistics (Phase 5)
-        // CRITICAL: Must run BEFORE sorting to match C++ MFT insertion order.
-        // Hardlink delta rounding depends on child traversal order.
-        tracing::debug!("[TRIP] MftIndex::from_parsed_records -> Phase 5: compute_tree_metrics");
-        index.compute_tree_metrics();
-
-        // 3. Sort directory children for natural ordering (Phase 4)
-        // This is purely for display/output - tree metrics must run first.
+        // 2. Sort directory children for natural ordering (Phase 4)
+        // CRITICAL: Must run BEFORE computing tree metrics for correct size
+        // aggregation.
         tracing::debug!("[TRIP] MftIndex::from_parsed_records -> Phase 4: sort_directory_children");
         index.sort_directory_children();
 
+        // 3. Compute tree metrics for directory statistics (Phase 5)
+        // Must run AFTER sorting - depends on sorted child traversal order.
+        tracing::debug!("[TRIP] MftIndex::from_parsed_records -> Phase 5: compute_tree_metrics");
+        index.compute_tree_metrics();
+
         // 4. Set forensic mode flag if any forensic records were included
         index.forensic_mode = has_forensic_records;
 

crates/uffs-mft/src/index/merge.rs

@@ -54,12 +54,12 @@ impl MftIndex {
         debug!("🔨 Building extension index...");
         self.extension_index = Some(ExtensionIndex::build(self));
 
-        debug!("🔨 Computing tree metrics...");
-        self.compute_tree_metrics();
-
         debug!("🔨 Sorting directory children...");
         self.sort_directory_children();
 
+        debug!("🔨 Computing tree metrics...");
+        self.compute_tree_metrics();
+
         debug!("✅ Post-processing complete");
     }
 

crates/uffs-mft/src/io/parser/index.rs

@@ -121,6 +121,12 @@ pub fn parse_record_to_index(data: &[u8], frs: u64, index: &mut crate::index::Mf
             break;
         }
 
+        // Validate that the attribute's declared length fits within the record data
+        // This prevents reading past record boundaries when attributes are truncated
+        if offset + attr_header.length as usize > data.len() {
+            break; // Attribute extends past record — stop processing
+        }
+
         let attr_type = AttributeType::from_u32(attr_header.type_code);
         match attr_type {
             Some(AttributeType::StandardInformation) => {
@@ -217,7 +223,9 @@ pub fn parse_record_to_index(data: &[u8], frs: u64, index: &mut crate::index::Mf
                         );
                         lowest_vcn == 0
                     } else {
-                        false // Can't verify, skip to be safe
+                        // Can't read LowestVCN — assume primary (LowestVCN == 0 is common case)
+                        // This prevents skipping valid $DATA attributes near record boundaries
+                        true
                     }
                 };
 
@@ -245,6 +253,15 @@ pub fn parse_record_to_index(data: &[u8], frs: u64, index: &mut crate::index::Mf
                                 .unwrap_or([0; 8]),
                         );
                         (size, allocated)
+                    } else if alloc_offset + 8 <= data.len() {
+                        // Can read AllocatedSize but not DataSize — use AllocatedSize for both
+                        // This handles attributes truncated near record boundary
+                        let allocated = u64::from_le_bytes(
+                            data[alloc_offset..alloc_offset + 8]
+                                .try_into()
+                                .unwrap_or([0; 8]),
+                        );
+                        (allocated, allocated)
                     } else {
                         (0, 0)
                     }

crates/uffs-mft/src/reader/persistence.rs

@@ -609,12 +609,12 @@ impl MftReader {
             }
         }
 
-        // Compute tree metrics
-        index.compute_tree_metrics();
-
         // Sort directory children
         index.sort_directory_children();
 
+        // Compute tree metrics
+        index.compute_tree_metrics();
+
         let parse_time = parse_start.elapsed();
 
         info!(