Skip to content

Commit 2df2e2b

Browse files
[pruning][tasks_host] Use uworker_msg_pb2.CrashInfo like corpus_pruning (#4182)
Be consistent about the types we use. Fixes https://pantheon.corp.google.com/errors/detail/CMaFucrr75_x6QE;time=PT6H;locations=global?e=-13802955&mods=logs_tg_prod&project=clusterfuzz-external ``` AttributeError: can't set attribute at ._update_crash_unit_path ( /mnt/scratch0/bots/oss-fuzz-linux-zone1-host-v10g-8/clusterfuzz/src/clusterfuzz/_internal/bot/tasks/utasks/corpus_pruning_task.py:743 ) at ._upload_corpus_crashes_zip ( /mnt/scratch0/bots/oss-fuzz-linux-zone1-host-v10g-8/clusterfuzz/src/clusterfuzz/_internal/bot/tasks/utasks/corpus_pruning_task.py:754 ) at .utask_main ( /mnt/scratch0/bots/oss-fuzz-linux-zone1-host-v10g-8/clusterfuzz/src/clusterfuzz/_internal/bot/tasks/utasks/corpus_pruning_task.py:1021 ) ```
1 parent 84209bf commit 2df2e2b

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

src/clusterfuzz/_internal/bot/tasks/utasks/corpus_pruning_task.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ def process_bad_units(self, bad_units_path, quarantine_corpus_path, crashes):
454454
if state.crash_state not in crashes:
455455
security_flag = crash_analyzer.is_security_issue(
456456
state.crash_stacktrace, state.crash_type, state.crash_address)
457+
# TODO(metzman): Get rid of CorpusCrash and replace with CrashInfo.
457458
crashes[state.crash_state] = CorpusCrash(
458459
state.crash_state, state.crash_type, state.crash_address,
459460
state.crash_stacktrace, unit_path, security_flag)

src/clusterfuzz/_internal/bot/untrusted_runner/tasks_host.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
from clusterfuzz._internal.bot.untrusted_runner import file_host
2424
from clusterfuzz._internal.datastore import data_types
2525
from clusterfuzz._internal.protos import untrusted_runner_pb2
26+
from clusterfuzz._internal.protos import uworker_msg_pb2
2627
from clusterfuzz.fuzz import engine
2728

2829
from . import host
@@ -80,7 +81,7 @@ def do_corpus_pruning(uworker_input, context, revision):
8081
coverage_info.quarantine_location = response.coverage_info.quarantine_location
8182

8283
crashes = [
83-
corpus_pruning_task.CorpusCrash(
84+
uworker_msg_pb2.CrashInfo(
8485
crash_state=crash.crash_state,
8586
crash_type=crash.crash_type,
8687
crash_address=crash.crash_address,

0 commit comments

Comments
 (0)