Skip to content

fix(ubi): add exception handler for SeekError #852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 6, 2024
Merged

fix(ubi): add exception handler for SeekError #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e3425f
fix(ubi): add exception handler for SeekError
May 15, 2024
9143144
fix(ubifs): attempts to continue extracting files even with bad block…
qkaiser Jun 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions tests/integration/filesystem/ubi/ubi/__input__/orange.ubi.truncated.img
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions .../integration/filesystem/ubi/ubi/__output__/orange.ubi.truncated.img_extract/0-3407872.ubi
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions ...nge.ubi.truncated.img_extract/0-3407872.ubi_extract/img-941083063_vol-configuration.ubifs
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions ...g_extract/0-3407872.ubi_extract/img-941083063_vol-configuration.ubifs_extract/orange1.txt
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions ...g_extract/0-3407872.ubi_extract/img-941083063_vol-configuration.ubifs_extract/orange2.txt
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions ...t__/orange.ubi.truncated.img_extract/0-3407872.ubi_extract/img-941083063_vol-rootfs.ubifs
View file
Open in desktop
Git LFS file not shown
3 changes: 3 additions & 0 deletions ...on/filesystem/ubi/ubi/__output__/orange.ubi.truncated.img_extract/3407872-3430400.unknown
View file
Open in desktop
Git LFS file not shown
10 changes: 6 additions & 4 deletions unblob/handlers/filesystem/ubi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from unblob.extractors import Command

from ...file_utils import InvalidInputFormat, get_endian, iterate_patterns
from ...file_utils import InvalidInputFormat, SeekError, get_endian, iterate_patterns
from ...iter_utils import get_intervals
from ...models import File, Handler, HexString, StructHandler, ValidChunk

Expand Down Expand Up @@ -81,7 +81,7 @@ class UBIFSHandler(StructHandler):
"""
HEADER_STRUCT = "ubifs_sb_node_t"

EXTRACTOR = Command("ubireader_extract_files", "{inpath}", "-o", "{outdir}")
EXTRACTOR = Command("ubireader_extract_files", "{inpath}", "-w", "-o", "{outdir}")

def calculate_chunk(self, file: File, start_offset: int) -> Optional[ValidChunk]:
endian = get_endian(file, self._BIG_ENDIAN_MAGIC)
Expand Down Expand Up @@ -137,8 +137,10 @@ def _walk_ubi(self, file: File, peb_size: int) -> int:
first_bytes = file.read(len(self._UBI_EC_HEADER))
if first_bytes == b"" or first_bytes != self._UBI_EC_HEADER:
break
file.seek(offset + peb_size)

try:
file.seek(offset + peb_size)
except SeekError:
break
return offset

def calculate_chunk(self, file: File, start_offset: int) -> Optional[ValidChunk]:
Expand Down