Skip to content

Commit

Permalink
Revert "Fix error in serializing to FuzzTaskCrash". Commit was pushed…
Browse files Browse the repository at this point in the history
… accidentally. (#4084)

This reverts commit 53384c4.
  • Loading branch information
jonathanmetzman committed Jul 2, 2024
1 parent 53384c4 commit 90dd1e5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 14 deletions.
14 changes: 1 addition & 13 deletions src/clusterfuzz/_internal/bot/tasks/utasks/fuzz_task.py
Original file line number Diff line number Diff line change
Expand Up @@ -302,22 +302,10 @@ def to_proto(self):
crash.security_flag = self.security_flag
crash.key = self.key
crash.should_be_ignored = self.should_be_ignored
crash_frames = _filter_crash_frames_for_proto(self.crash_frames)
crash.crash_frames.extend(crash_frames)
crash.crash_frames.extend(self.crash_frames)
return crash


def _filter_crash_frames_for_proto(crash_frames):
filtered_frames = []
for frame in crash_frames:
if frame is None:
continue
if not isinstance(frame, str):
logs.error(f'{frame} is of type: {type(frame)}')
filtered_frames.append(frame)
return filtered_frames


def find_main_crash(crashes: List[Crash], full_fuzzer_name: str,
test_timeout: int, upload_urls: UploadUrlCollection):
"""Find the first reproducible crash or the first valid crash. And return the
Expand Down
2 changes: 1 addition & 1 deletion src/clusterfuzz/stacktraces/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,7 @@ def parse(self, stacktrace: str) -> CrashInfo:
# Update address from the first stack frame unless we already have
# more detailed information from KASan.
if state.frame_count == 1 and not state.is_kasan:
state.crash_address = f'0x{android_kernel_match.group(1)}'
state.crash_address = '0x%s' % android_kernel_match.group(1)
continue

# Android kernel stack frame without address
Expand Down

0 comments on commit 90dd1e5

Please sign in to comment.