From b2504035901865106680d7edd9d470c031bd7c5c Mon Sep 17 00:00:00 2001 From: Max Moroz Date: Thu, 4 Apr 2019 22:55:18 +0000 Subject: [PATCH] [libFuzzer] Another follow up fix for Data Flow scripts in Py3. Reviewers: Dor1s Reviewed By: Dor1s Subscribers: delcypher, #sanitizers, llvm-commits Tags: #llvm, #sanitizers Differential Revision: https://reviews.llvm.org/D60289 llvm-svn: 357732 --- compiler-rt/lib/fuzzer/scripts/merge_data_flow.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/compiler-rt/lib/fuzzer/scripts/merge_data_flow.py b/compiler-rt/lib/fuzzer/scripts/merge_data_flow.py index ba004ac..b442b89 100755 --- a/compiler-rt/lib/fuzzer/scripts/merge_data_flow.py +++ b/compiler-rt/lib/fuzzer/scripts/merge_data_flow.py @@ -18,7 +18,7 @@ def Merge(a, b): res = array('b') for i in range(0, len(a)): res.append(ord('1' if a[i] == '1' or b[i] == '1' else '0')) - return res.tostring() + return res.tostring().decode('utf-8') def main(argv): D = {} @@ -29,7 +29,11 @@ def main(argv): else: D[F] = BV; for F in D.keys(): - print("%s %s" % (F, str(D[F]))) + if isinstance(D[F], str): + value = D[F] + else: + value = D[F].decode('utf-8') + print("%s %s" % (F, value)) if __name__ == '__main__': main(sys.argv) -- 2.7.4