new file mode 100644
--- /dev/null
+++ b/browser/extensions/asan-reporter/LICENSE
@@ -0,0 +1,373 @@
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+ means each individual or legal entity that creates, contributes to
+ the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+ means the combination of the Contributions of others (if any) used
+ by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+ means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+ means Source Code Form to which the initial Contributor has attached
+ the notice in Exhibit A, the Executable Form of such Source Code
+ Form, and Modifications of such Source Code Form, in each case
+ including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+ means
+
+ (a) that the initial Contributor has attached the notice described
+ in Exhibit B to the Covered Software; or
+
+ (b) that the Covered Software was made available under the terms of
+ version 1.1 or earlier of the License, but not also under the
+ terms of a Secondary License.
+
+1.6. "Executable Form"
+ means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+ means a work that combines Covered Software with other material, in
+ a separate file or files, that is not Covered Software.
+
+1.8. "License"
+ means this document.
+
+1.9. "Licensable"
+ means having the right to grant, to the maximum extent possible,
+ whether at the time of the initial grant or subsequently, any and
+ all of the rights conveyed by this License.
+
+1.10. "Modifications"
+ means any of the following:
+
+ (a) any file in Source Code Form that results from an addition to,
+ deletion from, or modification of the contents of Covered
+ Software; or
+
+ (b) any new file in Source Code Form that contains any Covered
+ Software.
+
+1.11. "Patent Claims" of a Contributor
+ means any patent claim(s), including without limitation, method,
+ process, and apparatus claims, in any patent Licensable by such
+ Contributor that would be infringed, but for the grant of the
+ License, by the making, using, selling, offering for sale, having
+ made, import, or transfer of either its Contributions or its
+ Contributor Version.
+
+1.12. "Secondary License"
+ means either the GNU General Public License, Version 2.0, the GNU
+ Lesser General Public License, Version 2.1, the GNU Affero General
+ Public License, Version 3.0, or any later versions of those
+ licenses.
+
+1.13. "Source Code Form"
+ means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+ means an individual or a legal entity exercising rights under this
+ License. For legal entities, "You" includes any entity that
+ controls, is controlled by, or is under common control with You. For
+ purposes of this definition, "control" means (a) the power, direct
+ or indirect, to cause the direction or management of such entity,
+ whether by contract or otherwise, or (b) ownership of more than
+ fifty percent (50%) of the outstanding shares or beneficial
+ ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+ Licensable by such Contributor to use, reproduce, make available,
+ modify, display, perform, distribute, and otherwise exploit its
+ Contributions, either on an unmodified basis, with Modifications, or
+ as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+ for sale, have made, import, and otherwise transfer either its
+ Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+ or
+
+(b) for infringements caused by: (i) Your and any other third party's
+ modifications of Covered Software, or (ii) the combination of its
+ Contributions with other software (except as part of its Contributor
+ Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+ its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+ Form, as described in Section 3.1, and You must inform recipients of
+ the Executable Form how they can obtain a copy of such Source Code
+ Form by reasonable means in a timely manner, at a charge no more
+ than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+ License, or sublicense it under different terms, provided that the
+ license for the Executable Form does not attempt to limit or alter
+ the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+* *
+* 6. Disclaimer of Warranty *
+* ------------------------- *
+* *
+* Covered Software is provided under this License on an "as is" *
+* basis, without warranty of any kind, either expressed, implied, or *
+* statutory, including, without limitation, warranties that the *
+* Covered Software is free of defects, merchantable, fit for a *
+* particular purpose or non-infringing. The entire risk as to the *
+* quality and performance of the Covered Software is with You. *
+* Should any Covered Software prove defective in any respect, You *
+* (not any Contributor) assume the cost of any necessary servicing, *
+* repair, or correction. This disclaimer of warranty constitutes an *
+* essential part of this License. No use of any Covered Software is *
+* authorized under this License except under this disclaimer. *
+* *
+************************************************************************
+
+************************************************************************
+* *
+* 7. Limitation of Liability *
+* -------------------------- *
+* *
+* Under no circumstances and under no legal theory, whether tort *
+* (including negligence), contract, or otherwise, shall any *
+* Contributor, or anyone who distributes Covered Software as *
+* permitted above, be liable to You for any direct, indirect, *
+* special, incidental, or consequential damages of any character *
+* including, without limitation, damages for lost profits, loss of *
+* goodwill, work stoppage, computer failure or malfunction, or any *
+* and all other commercial damages or losses, even if such party *
+* shall have been informed of the possibility of such damages. This *
+* limitation of liability shall not apply to liability for death or *
+* personal injury resulting from such party's negligence to the *
+* extent applicable law prohibits such limitation. Some *
+* jurisdictions do not allow the exclusion or limitation of *
+* incidental or consequential damages, so this exclusion and *
+* limitation may not apply to You. *
+* *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+ This Source Code Form is subject to the terms of the Mozilla Public
+ License, v. 2.0. If a copy of the MPL was not distributed with this
+ file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+ This Source Code Form is "Incompatible With Secondary Licenses", as
+ defined by the Mozilla Public License, v. 2.0.
new file mode 100644
--- /dev/null
+++ b/browser/extensions/asan-reporter/README.md
@@ -0,0 +1,52 @@
+# firefox-asan-reporter
+
+The ASan reporter addon for Firefox is an internal addon used in conjunction
+with special ASan (AddressSanitizer) builds of Firefox Nightly. Its main purpose
+is to scan for ASan crash report files on startup and submit them back to our
+crash handling infrastructure. Due to the way AddressSanitizer produces its
+crash information, it would be challenging (if possible at all), to get it
+working with our regular crash reporter.
+
+The addon is only enabled in builds with the --enable-address-sanitizer-reporter
+flag set at build time. Currently, we don't produce such builds, but this might
+change once we decide to hand out Firefox+ASan Nightly builds as part of a
+special opt-in program.
+
+## Prefs
+
+### asanreporter.apiurl
+
+The URL to the server receiving the crash information.
+
+### asanreporter.clientid
+
+The client id to send along with the crash information. By default, this is
+empty. If the user wishes, they can set this pref to e.g. an email address to
+allow us to contact them.
+
+### asanreporter.authtoken
+
+This is an authorization token that can be used in test setups with a non-public
+API endpoint that requires authentication. In the final setup, this pref remains
+empty.
+
+### asanreporter.loglevel
+
+This optional variable can be used to change the default logging level. The
+reporter addon uses Log.jsm which defines the following values for different
+levels of logging:
+
+| Level Name | Value |
+| ---------- | ----- |
+| ALL | 0 |
+| TRACE | 10 |
+| DEBUG | 20 |
+| CONFIG | 30 |
+| INFO | 40 |
+| WARN | 50 |
+| ERROR | 60 |
+| FATAL | 70 |
+
+The default logging level is INFO. All log messages are emitted to the browser
+console and stdout. Switching the logging level to DEBUG causes additional
+debug messages related to server requests (XHR) to be emitted.
new file mode 100644
--- /dev/null
+++ b/browser/extensions/asan-reporter/bootstrap.js
@@ -0,0 +1,169 @@
+/* -*- indent-tabs-mode: nil; js-indent-level: 2 -*- */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+
+const {classes: Cc, interfaces: Ci, utils: Cu, manager: Cm} = Components;
+
+Cu.import("resource://gre/modules/AppConstants.jsm");
+Cu.import("resource://gre/modules/FileUtils.jsm");
+Cu.import("resource://gre/modules/Log.jsm");
+Cu.import("resource://gre/modules/Preferences.jsm");
+Cu.import("resource://gre/modules/Services.jsm");
+Cu.import("resource://gre/modules/XPCOMUtils.jsm");
+
+const XMLHttpRequest = Components.Constructor("@mozilla.org/xmlextras/xmlhttprequest;1");
+
+XPCOMUtils.defineLazyModuleGetter(this, "OS", "resource://gre/modules/osfile.jsm");
+
+Cu.importGlobalProperties(["TextDecoder"]);
+
+// Define our prefs
+const PREF_CLIENT_ID = "asanreporter.clientid";
+const PREF_API_URL = "asanreporter.apiurl";
+const PREF_AUTH_TOKEN = "asanreporter.authtoken";
+const PREF_LOG_LEVEL = "asanreporter.loglevel";
+
+// Setup logging
+const LOGGER_NAME = "extensions.asanreporter";
+let logger = Log.repository.getLogger(LOGGER_NAME);
+logger.addAppender(new Log.ConsoleAppender(new Log.BasicFormatter()));
+logger.addAppender(new Log.DumpAppender(new Log.BasicFormatter()));
+logger.level = Preferences.get(PREF_LOG_LEVEL, Log.Level.Info);
+
+function install(aData, aReason) {}
+
+function uninstall(aData, aReason) {}
+
+function startup(aData, aReason) {
+ logger.info("Starting up...");
+ // We could use OS.Constants.Path.tmpDir here, but unfortunately there is
+ // no way in C++ to get the same value *prior* to xpcom initialization.
+ // Since ASan needs its options, including the "log_path" option already
+ // at early startup, there is no way to pass this on to ASan.
+ //
+ // Instead, we hardcode the /tmp directory here, which should be fine in
+ // most cases, as long as we are on Linux and Mac (the main targets for
+ // this addon at the time of writing).
+ processDirectory("/tmp");
+}
+
+function shutdown(aData, aReason) {
+ logger.info("Shutting down...");
+}
+
+function processDirectory(pathString) {
+ let iterator = new OS.File.DirectoryIterator(pathString);
+ let results = [];
+
+ // Scan the directory for any ASan logs that we haven't
+ // submitted yet. Store the filenames in an array so we
+ // can close the iterator early.
+ iterator.forEach(
+ (entry) => {
+ if (entry.name.indexOf("ff_asan_log.") == 0
+ && entry.name.indexOf("submitted") < 0) {
+ results.push(entry);
+ }
+ }
+ ).then(
+ () => {
+ iterator.close();
+ logger.info("Processing " + results.length + " reports...")
+
+ // Sequentially submit all reports that we found. Note that doing this
+ // with Promise.all would not result in a sequential ordering and would
+ // cause multiple requests to be sent to the server at once.
+ let requests = Promise.resolve()
+ results.forEach(
+ (result) => { requests = requests.then(
+ // We return a promise here that already handles any submit failures
+ // so our chain is not interrupted if one of the reports couldn't
+ // be submitted for some reason.
+ () => submitReport(result.path).then(
+ () => { logger.info("Successfully submitted " + result.path) },
+ (e) => { logger.error("Failed to submit " + result.path + ". Reason: " + e) },
+ )
+ )}
+ )
+
+ requests.then(() => logger.info("Done processing reports."))
+ },
+ (e) => {
+ iterator.close();
+ logger.error("Error while iterating over report files: " + e);
+ }
+ );
+}
+
+function submitReport(reportFile) {
+ logger.info("Processing " + reportFile);
+ return OS.File.read(reportFile).then(submitToServer).then(
+ () => {
+ // Mark as submitted only if we successfully submitted it to the server.
+ return OS.File.move(reportFile, reportFile + ".submitted")
+ }
+ );
+}
+
+function submitToServer(data) {
+ return new Promise(function (resolve, reject) {
+ logger.debug("Setting up XHR request");
+ let cid = Preferences.get(PREF_CLIENT_ID);
+ let api_url = Preferences.get(PREF_API_URL);
+ let auth_token = Preferences.get(PREF_AUTH_TOKEN);
+
+ let decoder = new TextDecoder();
+
+ if (!cid) {
+ cid = "unknown";
+ }
+
+ let versionArr = [
+ Services.appinfo.version,
+ Services.appinfo.appBuildID,
+ (AppConstants.SOURCE_REVISION_URL || "unknown")
+ ]
+
+ // Concatenate all relevant information as our server only
+ // has one field available for version information.
+ let version = versionArr.join("-");
+ let os = AppConstants.platform;
+
+ let reportObj = {
+ rawStdout: "",
+ rawStderr: "",
+ rawCrashData: decoder.decode(data),
+ // Hardcode platform as there is no other reasonable platform for ASan
+ platform: "x86-64",
+ product: "mozilla-central-asan-nightly",
+ product_version: version,
+ os: os,
+ client: cid,
+ tool: "asan-nightly-program"
+ }
+
+ var xhr = new XMLHttpRequest();
+ xhr.open('POST', api_url, true);
+ xhr.setRequestHeader("Content-Type", "application/json");
+
+ // For internal testing purposes, an auth_token can be specified
+ if (auth_token) {
+ xhr.setRequestHeader("Authorization", "Token " + auth_token);
+ }
+
+ xhr.onreadystatechange = function () {
+ if (xhr.readyState == 4) {
+ if (xhr.status == "201") {
+ logger.debug("XHR: OK");
+ resolve(xhr);
+ } else {
+ logger.debug("XHR: Status: " + xhr.status + " Response: " + xhr.responseText);
+ reject(xhr);
+ }
+ }
+ };
+
+ xhr.send(JSON.stringify(reportObj));
+ });
+}
new file mode 100755
--- /dev/null
+++ b/browser/extensions/asan-reporter/clone_asan_reporter.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+mkdir tmp/
+git clone --no-checkout --depth 1 https://github.com/choller/firefox-asan-reporter tmp/
+(cd tmp && git reset --hard ac5dc3f95b41429be79a7dcf8bf13a1075e850be)
+
+# Copy only whitelisted files
+cp tmp/bootstrap.js tmp/install.rdf.in tmp/moz.build tmp/README.md tmp/LICENSE .
+
+# Remove the temporary directory
+rm -Rf tmp/
new file mode 100644
--- /dev/null
+++ b/browser/extensions/asan-reporter/install.rdf.in
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+ - License, v. 2.0. If a copy of the MPL was not distributed with this
+ - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
+
+#filter substitution
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+ <Description about="urn:mozilla:install-manifest">
+ <em:id>asan-reporter@mozilla.org</em:id>
+ <em:version>1.0.0</em:version>
+ <em:type>2</em:type>
+ <em:bootstrap>true</em:bootstrap>
+ <em:multiprocessCompatible>true</em:multiprocessCompatible>
+
+ <!-- Target Application this theme can install into,
+ with minimum and maximum supported versions. -->
+ <em:targetApplication>
+ <Description>
+ <!-- Firefox GUID -->
+ <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+ <em:minVersion>@MOZ_APP_VERSION@</em:minVersion>
+ <em:maxVersion>@MOZ_APP_MAXVERSION@</em:maxVersion>
+ </Description>
+ </em:targetApplication>
+
+ <!-- Front End MetaData -->
+ <em:name>ASan Crash Reporter</em:name>
+ <em:description>Submit local ASan crash reports to Mozilla</em:description>
+ </Description>
+</RDF>
new file mode 100644
--- /dev/null
+++ b/browser/extensions/asan-reporter/moz.build
@@ -0,0 +1,10 @@
+DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+DEFINES['MOZ_APP_MAXVERSION'] = CONFIG['MOZ_APP_MAXVERSION']
+
+FINAL_TARGET_FILES.features['asan-reporter@mozilla.org'] += [
+ 'bootstrap.js'
+]
+
+FINAL_TARGET_PP_FILES.features['asan-reporter@mozilla.org'] += [
+ 'install.rdf.in'
+]
--- a/browser/extensions/moz.build
+++ b/browser/extensions/moz.build
@@ -37,8 +37,14 @@ if CONFIG['MOZ_DEV_EDITION'] or CONFIG['
'webcompat-reporter',
]
# Only include mortar system add-ons if we locally enable it
if CONFIG['MOZ_MORTAR']:
DIRS += [
'mortar',
]
+
+# Add ASan reporter system add-on if requested
+if CONFIG['MOZ_ASAN_REPORTER']:
+ DIRS += [
+ 'asan-reporter',
+ ]
--- a/mozglue/build/AsanOptions.cpp
+++ b/mozglue/build/AsanOptions.cpp
@@ -27,15 +27,26 @@
// this will also likely require setting LSAN_OPTIONS with a suppression
// file, as in build/sanitizers/lsan_suppressions.txt.
//
// allocator_may_return_null=1 - Tell ASan to return NULL when an allocation
// fails instead of aborting the program. This allows us to handle failing
// allocations the same way we would handle them with a regular allocator and
// also uncovers potential bugs that might occur in these situations.
//
+// log_path=/tmp/ff_asan_log - When running with the ASan reporter extension
+// enabled (MOZ_ASAN_REPORTER), then we need to dump our logs to files
+// instead of stderr so the reporter extension can find it. Unfortunately,
+// this function is called so early at startup that we can't use the profile
+// directory or even ask XPCOM for a temporary directory. Since the extension
+// is only meant to run on Linux and Mac OSX for now, hardcoding /tmp is an
+// option that should work for most standard environments.
+//
extern "C" MOZ_ASAN_BLACKLIST
const char* __asan_default_options() {
return "allow_user_segv_handler=1:alloc_dealloc_mismatch=0:detect_leaks=0"
+#ifdef MOZ_ASAN_REPORTER
+ ":log_path=/tmp/ff_asan_log"
+#endif
":allocator_may_return_null=1";
}
#endif
--- a/toolkit/moz.configure
+++ b/toolkit/moz.configure
@@ -1185,8 +1185,21 @@ option('--enable-cubeb-remoting', env='M
@depends('--enable-cubeb-remoting')
def cubeb_remoting(value):
if value:
return True
set_config('MOZ_CUBEB_REMOTING', cubeb_remoting)
set_define('MOZ_CUBEB_REMOTING', cubeb_remoting)
+
+# ASan Reporter Addon
+# ==============================================================
+option('--enable-address-sanitizer-reporter',
+ help='Enable Address Sanitizer Reporter Extension')
+
+@depends('--enable-address-sanitizer-reporter')
+def enable_asan_reporter(value):
+ if value:
+ return True
+
+set_config('MOZ_ASAN_REPORTER', enable_asan_reporter)
+set_define('MOZ_ASAN_REPORTER', enable_asan_reporter)