Avoid some obvious crash risks

This commit is contained in:
Thaddee Tyl 2014-09-28 14:51:45 +02:00
parent f45ba3f8d1
commit 13da9997d3

View File

@ -227,7 +227,8 @@ cache(function(data, match, sendBadge) {
branch = branch || 'master'; branch = branch || 'master';
var badgeData = getBadgeData('build', data); var badgeData = getBadgeData('build', data);
request(options, function(err, res, json) { request(options, function(err, res, json) {
if (err != null || (json.length !== undefined && json.length === 0)) { if (err != null || json == null
|| (json.length !== undefined && json.length === 0)) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData); sendBadge(format, badgeData);
return; return;
@ -923,14 +924,13 @@ cache(function(data, match, sendBadge) {
sendBadge(format, badgeData); sendBadge(format, badgeData);
return; return;
} }
} catch(e) {
badgeData.text[1] = 'malformed';
sendBadge(format, badgeData);
return;
}
badgeData.text[1] = score + '%'; badgeData.text[1] = score + '%';
badgeData.colorscheme = coveragePercentageColor(percentage); badgeData.colorscheme = coveragePercentageColor(percentage);
sendBadge(format, badgeData); sendBadge(format, badgeData);
} catch(e) {
badgeData.text[1] = 'malformed';
sendBadge(format, badgeData);
}
}).on('error', function(e) { }).on('error', function(e) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';
sendBadge(format, badgeData); sendBadge(format, badgeData);
@ -974,7 +974,6 @@ cache(function(data, match, sendBadge) {
} catch(e) { } catch(e) {
badgeData.text[1] = 'malformed'; badgeData.text[1] = 'malformed';
sendBadge(format, badgeData); sendBadge(format, badgeData);
return;
} }
}).on('error', function(e) { }).on('error', function(e) {
badgeData.text[1] = 'inaccessible'; badgeData.text[1] = 'inaccessible';