Skip to content

Fix new line handling in crash logs #3

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

Open
JudahJL wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix new line handling in crash logs #3

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
65 changes: 35 additions & 30 deletions crashlogtools/crashlogutil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,15 @@ def add_name(line: bytes, id_lookup: Dict[int, bytes], width: int) -> bytes:
if not match:
return line

ending = CrashLogProcessor.get_line_ending(line)

stack_frame = match.group(0)
name = id_lookup.get(int(match.group("id")))
if not name:
return stack_frame + b"\n"
return stack_frame + ending

name = name.rstrip(b"_*")
return stack_frame.ljust(width, b' ') + name + b"\n"
return stack_frame.ljust(width, b' ') + name + ending

def lookup_ids(self, id_list: List[int]) -> Dict[int, bytes]:
database = self.get_database_path()
Expand All @@ -98,6 +100,16 @@ def lookup_ids(self, id_list: List[int]) -> Dict[int, bytes]:
lookup[addr_id] = name
return lookup

@staticmethod
def get_line_ending(line: bytes) -> bytes:
if line.endswith(b"\r\n"):
return b"\r\n"
if line.endswith(b"\n"):
return b"\n"
if line.endswith(b"\r"):
return b"\r"
return b""


class CrashLog:
def __init__(self, path: Path):
Expand Down Expand Up @@ -125,35 +137,28 @@ def write_file(self, path: Path) -> None:
f.writelines(self.post_call_stack)

def read_file(self, path: Path) -> None:
with path.open("rb") as f:
while True:
line = f.readline()
if not line:
return

self.pre_call_stack.append(line)
if line == b"PROBABLE CALL STACK:\n":
break

while True:
line = f.readline()
if not line:
return

if line == b"\n":
break
elif line == b"REGISTERS:\n":
self.post_call_stack.append(b"\n")
break

self.call_stack.append(line)

while True:
data = path.read_bytes()
lines = data.splitlines(keepends=True)

it = iter(lines)

for line in it:
self.pre_call_stack.append(line)
if line in (b"PROBABLE CALL STACK:\n", b"PROBABLE CALL STACK:\r\n", b"PROBABLE CALL STACK:\r",):
break
else:
return

for line in it:
if line.strip() == b"":
break
if line in (b"REGISTERS:\n", b"REGISTERS:\r\n", b"REGISTERS:\r"):
self.post_call_stack.append(line)
break
self.call_stack.append(line)

line = f.readline()
if not line:
return
for line in it:
self.post_call_stack.append(line)


class IdScanner:
Expand Down Expand Up @@ -184,4 +189,4 @@ def find(self, addr_id: int) -> Optional[bytes]:
return None

self.nextLine = self.f.readline()
return None
return None