Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
shelld3v authored Dec 20, 2024
1 parent d56a21b commit 27c0a13
Showing 1 changed file with 4 additions and 11 deletions.
15 changes: 4 additions & 11 deletions lib/core/fuzzer.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@ def __init__(
self._dictionary = dictionary
self._base_path: str = ""
self._hashes: dict = {}
self.exc: Exception | None = None
self.match_callbacks = match_callbacks
self.not_found_callbacks = not_found_callbacks
self.error_callbacks = error_callbacks
Expand Down Expand Up @@ -264,11 +263,8 @@ def scan(self, path: str) -> None:
self._hashes.setdefault(hash_, 0)
self._hashes[hash_] += 1

try:
for callback in self.match_callbacks:
callback(response)
except Exception as e:
self.exc = e
for callback in self.match_callbacks:
callback(response)

def thread_proc(self) -> None:
logger.info(f'THREAD-{threading.get_ident()} started"')
Expand Down Expand Up @@ -410,11 +406,8 @@ async def scan(self, path: str) -> None:
self._hashes.setdefault(hash_, 0)
self._hashes[hash_] += 1

try:
for callback in self.match_callbacks:
callback(response)
except Exception as e:
self.exc = e
for callback in self.match_callbacks:
callback(response)

async def task_proc(self) -> None:
async with self.sem:
Expand Down

0 comments on commit 27c0a13

Please sign in to comment.