Bug 1466863 - Just use empty metadata if invalid. r?florian draft
authorMichael Kaply <mozilla@kaply.com>
Wed, 06 Jun 2018 15:58:24 -0500
changeset 805234 734bdfec96e481fbee6e2df1bc9668854045d5c1
parent 804864 04cc917f68c5d554e5b9542cb3745c9453bba58d
push id112606
push usermozilla@kaply.com
push dateThu, 07 Jun 2018 15:11:35 +0000
reviewersflorian
bugs1466863
milestone62.0a1
Bug 1466863 - Just use empty metadata if invalid. r?florian MozReview-Commit-ID: 30Q5Sdi5ZRt
toolkit/components/search/nsSearchService.js
--- a/toolkit/components/search/nsSearchService.js
+++ b/toolkit/components/search/nsSearchService.js
@@ -2038,17 +2038,17 @@ Engine.prototype = {
     return json;
   },
 
   setAttr(name, val) {
     this._metaData[name] = val;
   },
 
   getAttr(name) {
-    return (this._metaData && this._metaData[name]) || undefined;
+    return this._metaData[name] || undefined;
   },
 
   // nsISearchEngine
   get alias() {
     return this.getAttr("alias");
   },
   set alias(val) {
     var value = val ? val.trim() : null;
@@ -3168,17 +3168,17 @@ SearchService.prototype = {
   _loadEnginesMetadataFromCache: function SRCH_SVC__loadEnginesMetadataFromCache(cache) {
     if (!cache.engines)
       return;
 
     for (let engine of cache.engines) {
       let name = engine._name;
       if (name in this._engines) {
         LOG("_loadEnginesMetadataFromCache, transfering metadata for " + name);
-        this._engines[name]._metaData = engine._metaData;
+        this._engines[name]._metaData = engine._metaData || {};
       }
     }
   },
 
   _loadEnginesFromCache: function SRCH_SVC__loadEnginesFromCache(cache,
                                                                  skipReadOnly) {
     if (!cache.engines)
       return;