jenkins-bot has submitted this change and it was merged.
Change subject: Don't crash if error object is read-only; reject with Error,
not string.
......................................................................
Don't crash if error object is read-only; reject with Error, not string.
Change-Id: Ief24282382eccbe4ed2f966ea53a6549d9c43282
---
M lib/index.js
M lib/parsoid.js
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Cscott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/index.js b/lib/index.js
index 8d0c96c..2a61821 100644
--- a/lib/index.js
+++ b/lib/index.js
@@ -458,7 +458,8 @@
}
// XXX Use different values to distinguish failure
types?
if (!err.exitCode) {
- err.exitCode = 1;
+ // Some error objects are read-only; don't
crash if so.
+ try { err.exitCode = 1; } catch (e) { /*
Ignore. */ }
}
throw err;
});
diff --git a/lib/parsoid.js b/lib/parsoid.js
index e8b3441..97abd51 100644
--- a/lib/parsoid.js
+++ b/lib/parsoid.js
@@ -219,7 +219,7 @@
var apiURL = findApiUrl('GET', this.apiVersion, this.wikis[wiki],
title, revid);
request({ url: apiURL.url, encoding: 'utf8', headers: headers, pool:
false, log: this.log }, function(error, response, body) {
if (error || response.statusCode !== 200) {
- deferred.reject('Error fetching ' + apiURL.api + '
result: ' + apiURL.url);
+ deferred.reject(new Error('Error fetching ' +
apiURL.api + ' result: ' + apiURL.url + ' ' + (error || response.statusCode)));
} else {
deferred.resolve(body);
}
@@ -253,7 +253,7 @@
),
}, function(error, response, body) {
if (error || response.statusCode !== 200) {
- reject('Error fetching ' + apiURL.api + '
result: ' + apiURL.url);
+ reject(new Error('Error fetching ' + apiURL.api
+ ' result: ' + apiURL.url + ' ' + (error || response.statusCode)));
} else {
resolve(body);
}
--
To view, visit https://gerrit.wikimedia.org/r/242156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief24282382eccbe4ed2f966ea53a6549d9c43282
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Collection/OfflineContentGenerator/bundler
Gerrit-Branch: master
Gerrit-Owner: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: Cscott <canan...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
