Bug 1466863 - Just use empty metadata if invalid. r?florian
MozReview-Commit-ID: 30Q5Sdi5ZRt
--- 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;