Skip to content

[pull] master from kevoreilly:master #515

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
pull merged 1 commit into from
Aug 6, 2026
+7 −2
Merged

[pull] master from kevoreilly:master #515

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 7 additions & 2 deletions lib/cuckoo/common/objects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,7 +626,12 @@ def get_yara(self, category="binaries", externals=None):
addresses = {}
for yara_string in match.patterns:
for x in yara_string.matches:
y_string = self._yara_encode_string(x.data)
matched_bytes = b""
if self.file_data and len(self.file_data) >= x.offset + x.length:
matched_bytes = self.file_data[x.offset : x.offset + x.length]
if getattr(x, "xor_key", None) is not None:
matched_bytes = bytes(b ^ x.xor_key for b in matched_bytes)
y_string = self._yara_encode_string(matched_bytes)
if y_string not in strings:
strings.append(y_string)
addresses.update({yara_string.identifier.strip("$"): x.offset})
Expand Down Expand Up @@ -664,7 +669,7 @@ def get_yara(self, category="binaries", externals=None):
log.exception("Unable to match Yara signatures for %s: %s", self.file_path, yara_error[errcode])
else:
log.exception("Unable to match Yara signatures for %s: unknown code %s", self.file_path, errcode)
elif HAVE_YARA_X and isinstance(e, yara_x.Error):
elif HAVE_YARA_X and isinstance(e, (yara_x.CompileError, yara_x.ScanError, yara_x.TimeoutError)):
log.exception("Unable to match Yara signatures (yara-x) for %s: %s", self.file_path, e)
else:
log.exception("Unable to match Yara signatures for %s: %s", self.file_path, e)
Expand Down
Loading