Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

don't silently truncate at newline in IRCLine.ParsedLine.truncate()

Browse source
This commit is contained in:
jesopo 2019-07-15 14:26:45 +01:00
parent e415afb12c
commit 4815c1612c
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/IRCLine.py
View file

@ -104,14 +104,18 @@ class ParsedLine(object):
else:
pieces.append(arg)
return tags, " ".join(pieces).split("\n")[0].strip("\r")
return tags, " ".join(pieces).replace("\r", "")
def format(self) -> str:
tags, line = self._format()
line, _ = self._newline_truncate(line)
if tags:
return "%s %s" % (tags, line)
else:
return line
def _newline_truncate(self, line: str) -> typing.Tuple[str, str]:
line, sep, overflow = line.partition("\n")
return [line, overflow]
def _line_max(self, hostmask: str, margin: int) -> int:
return LINE_MAX-len((":%s " % hostmask).encode("utf8"))-margin
def truncate(self, hostmask: str, margin: int=0) -> typing.Tuple[str, str]:
@ -123,7 +127,8 @@ class ParsedLine(object):
tags_formatted, line_formatted = self._format()
for i, char in enumerate(line_formatted):
encoded_char = char.encode("utf8")
if len(valid_bytes)+len(encoded_char) > line_max:
if (len(valid_bytes)+len(encoded_char) > line_max
or encoded_char == b"\n"):
break
else:
valid_bytes += encoded_char
@ -134,6 +139,8 @@ class ParsedLine(object):
if tags_formatted:
valid = "%s %s" % (tags_formatted, valid)
overflow = line_formatted[valid_index:]
if overflow and overflow[0] == "\n":
overflow = overflow[1:]
return valid, overflow