From 13da9997d317e053098b5fbb43808a4b50b05ab7 Mon Sep 17 00:00:00 2001
From: Thaddee Tyl <thaddee.tyl@gmail.com>
Date: Sun, 28 Sep 2014 14:51:45 +0200
Subject: [PATCH] Avoid some obvious crash risks

---
 server.js | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/server.js b/server.js
index e0dd75e..d048868 100644
--- a/server.js
+++ b/server.js
@@ -227,7 +227,8 @@ cache(function(data, match, sendBadge) {
   branch = branch || 'master';
   var badgeData = getBadgeData('build', data);
   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';
       sendBadge(format, badgeData);
       return;
@@ -923,14 +924,13 @@ cache(function(data, match, sendBadge) {
         sendBadge(format, badgeData);
         return;
       }
+      badgeData.text[1] = score + '%';
+      badgeData.colorscheme = coveragePercentageColor(percentage);
+      sendBadge(format, badgeData);
     } catch(e) {
       badgeData.text[1] = 'malformed';
       sendBadge(format, badgeData);
-      return;
     }
-    badgeData.text[1] = score + '%';
-    badgeData.colorscheme = coveragePercentageColor(percentage);
-    sendBadge(format, badgeData);
   }).on('error', function(e) {
     badgeData.text[1] = 'inaccessible';
     sendBadge(format, badgeData);
@@ -974,7 +974,6 @@ cache(function(data, match, sendBadge) {
     } catch(e) {
       badgeData.text[1] = 'malformed';
       sendBadge(format, badgeData);
-      return;
     }
   }).on('error', function(e) {
     badgeData.text[1] = 'inaccessible';