( )⚙ D11303 zeroconf: fix an issue concatenating bytes and str

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11303

zeroconf: fix an issue concatenating bytes and str
ClosedPublic

Authored by mharbison72 on Aug 18 2021, 3:00 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGad2c37075f46: zeroconf: fix an issue concatenating bytes and str
rHG66f720b3dd98: zeroconf: fix an issue concatenating bytes and str
Summary

bytes(length) doesn't do what we want, so use str.

There appear to be a ton more issues in this extension, including:

  • globals()[b'_GLOBAL_DONE'] using bytes as the key
  • __author__ and similar using bytes
  • BadDomainName is feeding bytes to the Exception constructor
  • DNSRecord.toString() has the wrong signature (should be str, not bytes)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mhgext/zeroconf/Zeroconf.py (2 lines)

Diff 30011

hgext/zeroconf/Zeroconf.py

def writeInt(self, value): def writeInt(self, value):
"""Writes an unsigned integer to the packet""" """Writes an unsigned integer to the packet"""
format = b'!I' format = b'!I'
self.data.append(struct.pack(format, int(value))) self.data.append(struct.pack(format, int(value)))
self.size += 4 self.size += 4
def writeString(self, value, length): def writeString(self, value, length):
"""Writes a string to the packet""" """Writes a string to the packet"""
format = b'!' + str(length) + b's' format = '!' + str(length) + 's'
self.data.append(struct.pack(format, value)) self.data.append(struct.pack(format, value))
self.size += length self.size += length
def writeUTF(self, s): def writeUTF(self, s):
"""Writes a UTF-8 string of a given length to the packet""" """Writes a UTF-8 string of a given length to the packet"""
utfstr = s.encode('utf-8') utfstr = s.encode('utf-8')
length = len(utfstr) length = len(utfstr)
if length > 64: if length > 64: