From f7bf6e7383ad8d44abe8014e99dc30fc125fe786 Mon Sep 17 00:00:00 2001 From: Pierre Date: Tue, 5 Jun 2018 15:42:08 -0300 Subject: [PATCH] fixed issue that caused exception when validating avatars with invalid metadata --- packages/rocketchat-file-upload/server/lib/FileUpload.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/rocketchat-file-upload/server/lib/FileUpload.js b/packages/rocketchat-file-upload/server/lib/FileUpload.js index 70d809a77c8..497a2ffa3b8 100644 --- a/packages/rocketchat-file-upload/server/lib/FileUpload.js +++ b/packages/rocketchat-file-upload/server/lib/FileUpload.js @@ -91,9 +91,14 @@ Object.assign(FileUpload, { s.rotate(); // Get metadata to resize the image the first time to keep "inside" the dimensions // then resize again to create the canvas around + s.metadata(Meteor.bindEnvironment((err, metadata) => { + if (!metadata) { + metadata = {}; + }; + s.toFormat(sharp.format.jpeg) - .resize(Math.min(height, metadata.width), Math.min(height, metadata.height)) + .resize(Math.min(height || 0, metadata.width || Infinity), Math.min(height || 0, metadata.height || Infinity)) .pipe(sharp() .resize(height, height) .background('#FFFFFF')