summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMoonchild <mcwerewolf@gmail.com>2018-06-23 19:04:43 +0200
committerGitHub <noreply@github.com>2018-06-23 19:04:43 +0200
commit89ee89f14109f06bbb0e7545f7cbe88af671c5ad (patch)
treee1642fb7584bb879f075e9a5130ecdb802a7b6d2
parent362bb20730ca3250f9f7c4103aeda3f8a240e7a8 (diff)
parent29f434c03ccfe6afe2543b0bad225a1ae973b986 (diff)
downloadUXP-89ee89f14109f06bbb0e7545f7cbe88af671c5ad.tar
UXP-89ee89f14109f06bbb0e7545f7cbe88af671c5ad.tar.gz
UXP-89ee89f14109f06bbb0e7545f7cbe88af671c5ad.tar.lz
UXP-89ee89f14109f06bbb0e7545f7cbe88af671c5ad.tar.xz
UXP-89ee89f14109f06bbb0e7545f7cbe88af671c5ad.zip
Merge pull request #535 from janekptacijarabaci/about_telemetry_error_1
Fix throws an error on "about:telemetry"
-rw-r--r--toolkit/content/aboutTelemetry.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/toolkit/content/aboutTelemetry.js b/toolkit/content/aboutTelemetry.js
index 2cf5e8909..c73a979c6 100644
--- a/toolkit/content/aboutTelemetry.js
+++ b/toolkit/content/aboutTelemetry.js
@@ -75,6 +75,10 @@ function isFlatArray(obj) {
* This is a helper function for explodeObject.
*/
function flattenObject(obj, map, path, array) {
+ if (!obj) {
+ return;
+ }
+
for (let k of Object.keys(obj)) {
let newPath = [...path, array ? "[" + k + "]" : k];
let v = obj[k];