Skip to content

Commit 67b12ff

Browse files
committed
Fixes issue mandiant#937: Show Offset and VirtAddr for language-specific strings: Go and Rust
1 parent 248bf05 commit 67b12ff

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

floss/language/go/extract.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -435,11 +435,11 @@ def get_file_offset_in_blob(sample: pathlib.Path) -> int:
435435
string_blob_start, _ = find_string_blob_range(pe, struct_strings)
436436
except ValueError:
437437
return -1
438-
438+
439439
image_base = pe.OPTIONAL_HEADER.ImageBase
440440
virtual_address = string_blob_start - image_base
441441
pointer_to_raw_data = pe.get_offset_from_rva(string_blob_start - image_base)
442-
442+
443443
return image_base + virtual_address - pointer_to_raw_data
444444

445445

floss/main.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ def main(argv=None) -> int:
709709

710710
if args.verbose:
711711
results.metadata.file_offset = floss.language.rust.extract.get_file_offset_in_rdata(sample)
712-
712+
713713
if (
714714
results.analysis.enable_decoded_strings
715715
or results.analysis.enable_stack_strings

floss/render/default.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -171,12 +171,14 @@ def strtime(seconds):
171171
return f"{m:02.0f}:{s:02.0f}"
172172

173173

174-
def render_language_strings(language, language_strings, language_strings_missed, file_offset, console, verbose, disable_headers):
174+
def render_language_strings(
175+
language, language_strings, language_strings_missed, file_offset, console, verbose, disable_headers
176+
):
175177
strings = sorted(language_strings + language_strings_missed, key=lambda s: s.offset)
176178
render_heading(f"FLOSS {language.upper()} STRINGS ({len(strings)})", console, verbose, disable_headers)
177179
offset_len = len(f"{strings[-1].offset}")
178180
va_offset_len = len(f"{strings[-1].offset + file_offset}")
179-
181+
180182
if verbose != Verbosity.DEFAULT:
181183
# add column headers
182184
table = Table(

0 commit comments

Comments
 (0)