diff --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py --- a/lldb/examples/python/crashlog.py +++ b/lldb/examples/python/crashlog.py @@ -397,7 +397,7 @@ class CrashLogParseException(Exception): - pass + pass class CrashLogParser: @@ -414,22 +414,22 @@ self.verbose = verbose self.crashlog = CrashLog(debugger, self.path, self.verbose) + def parse_json(self, buffer): + try: + return json.loads(buffer) + except: + # The first line can contain meta data. Try stripping it and try + # again. + head, _, tail = buffer.partition('\n') + return json.loads(tail) + def parse(self): with open(self.path, 'r') as f: buffer = f.read() - # Skip the first line if it contains meta data. - head, _, tail = buffer.partition('\n') try: - metadata = json.loads(head) - if 'app_name' in metadata and 'app_version' in metadata: - buffer = tail - except ValueError: - pass - - try: - self.data = json.loads(buffer) - except ValueError: + self.data = self.parse_json(buffer) + except: raise CrashLogFormatException() try: