This is an archive of the discontinued LLVM Phabricator instance.

Python 3: decode string as utf-8 to avoid type mismatch.
ClosedPublic

Authored by aprantl on Jun 13 2019, 6:23 PM.

Reviewers

davide
JDevlieghere

Commits

Summary

Side question: do we need to do this on every subprocess.check_output() in this file?

rdar://problem/51464644

yes.

Yep, we should decode all the check_output results, as they may contain unicode.

This revision now requires changes to proceed.Jun 13 2019, 11:08 PM

Address review feedback.

LGTM!

This revision is now accepted and ready to land.Jun 14 2019, 8:35 AM

This revision was automatically updated to reflect the committed changes.

Path

Size

lldb/

examples/

python/

2 lines

Show First 20 Lines • Show All 320 Lines • ▼ Show 20 Lines	class DarwinImage(symbolication.Image):
self.resolved_path = self.path		self.resolved_path = self.path
if not self.resolved_path and os.path.exists(self.path):		if not self.resolved_path and os.path.exists(self.path):
if not self.find_matching_slice():		if not self.find_matching_slice():
return False		return False
if not self.resolved_path and not os.path.exists(self.path):		if not self.resolved_path and not os.path.exists(self.path):
try:		try:
dsym = subprocess.check_output(		dsym = subprocess.check_output(
["/usr/bin/mdfind",		["/usr/bin/mdfind",
"com_apple_xcode_dsym_uuids == %s"%uuid_str])[:-1]		"com_apple_xcode_dsym_uuids == %s"%uuid_str]).decode("utf-8")[:-1]
if dsym and os.path.exists(dsym):		if dsym and os.path.exists(dsym):
print(('falling back to binary inside "%s"'%dsym))		print(('falling back to binary inside "%s"'%dsym))
self.symfile = dsym		self.symfile = dsym
dwarf_dir = os.path.join(dsym, 'Contents/Resources/DWARF')		dwarf_dir = os.path.join(dsym, 'Contents/Resources/DWARF')
for filename in os.listdir(dwarf_dir):		for filename in os.listdir(dwarf_dir):
self.path = os.path.join(dwarf_dir, filename)		self.path = os.path.join(dwarf_dir, filename)
if not self.find_matching_slice():		if not self.find_matching_slice():
return False		return False
▲ Show 20 Lines • Show All 718 Lines • Show Last 20 Lines