From 744adfeda0d6192536ea892b1e8ff14c822d2e35 Mon Sep 17 00:00:00 2001
From: Mike Auty <mike.auty@gmail.com>
Date: Sat, 30 Nov 2024 14:18:58 +0000
Subject: [PATCH] Core: Improve the scanning, but it's still not working yet

---
 volatility3/framework/interfaces/layers.py | 38 ++++++++++++++--------
 1 file changed, 25 insertions(+), 13 deletions(-)

diff --git a/volatility3/framework/interfaces/layers.py b/volatility3/framework/interfaces/layers.py
index 762f0a360..079366476 100644
--- a/volatility3/framework/interfaces/layers.py
+++ b/volatility3/framework/interfaces/layers.py
@@ -551,29 +551,41 @@ class TranslationLayerInterface(DataLayerInterface, metaclass=ABCMeta):
         assumed to have no holes
         """
         for section_start, section_length in sections:
-            output: List[Tuple[str, int, int]] = []
-
             # For each section, find out which bits of its exists and where they map to
             # This is faster than cutting the entire space into scan_chunk sized blocks and then
             # finding out what exists (particularly if most of the space isn't mapped)
 
+            chunk_start = chunk_position = section_start
+
             for mapped in self.mapping(
                 section_start, section_length, ignore_errors=True
             ):
+                # coallesce adjacent sections
                 offset, sublength, mapped_offset, mapped_length, layer_name = mapped
 
-                for block_start in range(
-                    offset, offset + sublength, scanner.chunk_size
-                ):
-                    block_end = min(
-                        offset + sublength,
-                        block_start + scanner.chunk_size + scanner.overlap,
-                    )
-                    output += [(self.name, block_start, block_end - block_start)]
+                if chunk_start == chunk_position and chunk_start != offset:
+                    chunk_start = chunk_position = offset
 
-                # Ship anything that might be left
-                if output:
-                    yield output, offset
+                if chunk_position < offset:
+                    # New chunk, output the old chunk
+                    yield [
+                        (self.name, chunk_start, chunk_position - chunk_start)
+                    ], chunk_start
+                    chunk_start = offset
+
+                if offset + sublength - chunk_start > scanner.chunk_size:
+                    for block_start in range(
+                        offset, offset + sublength, scanner.chunk_size
+                    ):
+                        yield [
+                            (self.name, chunk_start, chunk_position - chunk_start)
+                        ], chunk_start
+                        chunk_start = chunk_position = block_start
+
+                chunk_position = offset + sublength
+
+            # Ship anything that might be left
+            yield [(self.name, chunk_start, chunk_position - chunk_start)], chunk_start
 
 
 class LayerContainer(collections.abc.Mapping):