Merge branch 'master' into pres-pin-fixes

1 files changed, 14 insertions, 12 deletions

diff --git a/src/client/util/request-image-size.js b/src/client/util/request-image-size.js
index beb030635..502e0fbac 100644
--- a/src/client/util/request-image-size.js
+++ b/src/client/util/request-image-size.js
@@ -15,15 +15,18 @@ const HttpError = require('standard-http-error');
 
 module.exports = function requestImageSize(options) {
     let opts = {
-        encoding: null
+        encoding: null,
     };
 
     if (options && typeof options === 'object') {
         opts = Object.assign(options, opts);
     } else if (options && typeof options === 'string') {
-        opts = Object.assign({
-            uri: options
-        }, opts);
+        opts = Object.assign(
+            {
+                uri: options,
+            },
+            opts
+        );
     } else {
         return Promise.reject(new Error('You should provide an URI string or a "request" options object.'));
     }
@@ -38,9 +41,8 @@ module.exports = function requestImageSize(options) {
                 return reject(new HttpError(res.statusCode, res.statusMessage));
             }
 
-            let buffer = new Buffer.from([]);
+            let buffer = Buffer.from([]);
             let size;
-            let imageSizeError;
 
             res.on('data', chunk => {
                 buffer = Buffer.concat([buffer, chunk]);
@@ -48,8 +50,8 @@ module.exports = function requestImageSize(options) {
                 try {
                     size = imageSize(buffer);
                 } catch (err) {
-                    imageSizeError = err;
-                    return;
+                    reject(err);
+                    return req.abort();
                 }
 
                 if (size) {
@@ -58,11 +60,11 @@ module.exports = function requestImageSize(options) {
                 }
             });
 
-            res.on('error', err => reject(err));
+            res.on('error', reject);
 
             res.on('end', () => {
                 if (!size) {
-                    return reject(imageSizeError);
+                    return reject(new Error('Image has no size'));
                 }
 
                 size.downloaded = buffer.length;
@@ -70,6 +72,6 @@ module.exports = function requestImageSize(options) {
             });
         });
 
-        req.on('error', err => reject(err));
+        req.on('error', reject);
     });
-};
\ No newline at end of file
+};