ASAN_OPTIONS=allocator_may_return_null=1 needs to be set
authordburkart@apple.com <dburkart@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Mar 2015 00:01:42 +0000 (00:01 +0000)
committerdburkart@apple.com <dburkart@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 19 Mar 2015 00:01:42 +0000 (00:01 +0000)
https://bugs.webkit.org/show_bug.cgi?id=142547

Reviewed by Alexey Proskuryakov.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@181714 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/port/driver.py

index c001f4b..9906194 100644 (file)
@@ -1,3 +1,13 @@
+2015-03-18  Dana Burkart  <dburkart@apple.com>
+
+        ASAN_OPTIONS=allocator_may_return_null=1 needs to be set 
+        https://bugs.webkit.org/show_bug.cgi?id=142547
+
+        Reviewed by Alexey Proskuryakov.
+
+        * Scripts/webkitpy/port/driver.py:
+        (Driver._setup_environ_for_driver):
+
 2015-03-18  Alexey Proskuryakov  <ap@apple.com>
 
         Tweak how AppleSystemFontOSSubversion default is added
index ee86a87..69b480d 100755 (executable)
@@ -38,6 +38,7 @@ import os
 from webkitpy.common.system import path
 from webkitpy.common.system.profiler import ProfilerFactory
 from webkitpy.layout_tests.servers.web_platform_test_server import WebPlatformTestServer
+from webkitpy.common.asan.utils import ASanUtility
 
 
 _log = logging.getLogger(__name__)
@@ -316,6 +317,7 @@ class Driver(object):
         #environment['DUMPRENDERTREE_TEMP'] = str(self._port._driver_tempdir_for_environment())
         environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
         environment['LOCAL_RESOURCE_ROOT'] = self._port.layout_tests_dir()
+        environment['ASAN_OPTIONS'] = "allocator_may_return_null=1"
         if 'WEBKIT_OUTPUTDIR' in os.environ:
             environment['WEBKIT_OUTPUTDIR'] = os.environ['WEBKIT_OUTPUTDIR']
         if self._profiler: