Changeset 98758 in webkit

Timestamp:

Oct 28, 2011, 1:46:29 PM (15 years ago)

Author:

eric@webkit.org

Message:

NRWT crashes when parsing leaks output due to UTF-8 decoding error
​https://bugs.webkit.org/show_bug.cgi?id=71112

Reviewed by Adam Barth.

Use read_binary_file instead of read_text_file and add a test
case with some non-utf8 data to make sure we don't break this in the future.

• Scripts/webkitpy/layout_tests/port/leakdetector.py:
• Scripts/webkitpy/layout_tests/port/leakdetector_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/leakdetector.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/leakdetector_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-10-28  Eric Seidel  <eric@webkit.org>
+
+        NRWT crashes when parsing leaks output due to UTF-8 decoding error
+        https://bugs.webkit.org/show_bug.cgi?id=71112
+
+        Reviewed by Adam Barth.
+
+        Use read_binary_file instead of read_text_file and add a test
+        case with some non-utf8 data to make sure we don't break this in the future.
+
+        * Scripts/webkitpy/layout_tests/port/leakdetector.py:
+        * Scripts/webkitpy/layout_tests/port/leakdetector_unittest.py:
+
 2011-10-28  David Levin  <levin@chromium.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/port/leakdetector.py

@@ -121 +121 @@
         total_leaks = 0
         for leak_file_path in leak_file_paths:
-            leaks_output = self._filesystem.read_text_file(leak_file_path)
+            # Leaks have been seen to include non-utf8 data, so we use read_binary_file.
+            # See https://bugs.webkit.org/show_bug.cgi?id=71112.
+            leaks_output = self._filesystem.read_binary_file(leak_file_path)
             count, _, _ = self._parse_leaks_output(leaks_output)
             total_leaks += count

trunk/Tools/Scripts/webkitpy/layout_tests/port/leakdetector_unittest.py

@@ -110 +110 @@
         detector = self._make_detector()
         detector._filesystem = MockFileSystem({
-            '/mock-results/DumpRenderTree-1234-leaks.txt': 'Process 1234: 12 leaks for 40 total leaked bytes.\n',
+            # The \xff is some non-utf8 characters to make sure we don't blow up trying to parse the file.
+            '/mock-results/DumpRenderTree-1234-leaks.txt': '\xff\nProcess 1234: 12 leaks for 40 total leaked bytes.\n\xff\n',
             '/mock-results/DumpRenderTree-23423-leaks.txt': 'Process 1235: 12341 leaks for 27934 total leaked bytes.\n',
             '/mock-results/DumpRenderTree-823-leaks.txt': 'Process 12356: 23412 leaks for 18 total leaked bytes.\n',