fix for tinode/chat#212

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "tinode-webapp",
-  "version": "0.15.11",
+  "version": "0.15.12-rc1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -1775,26 +1775,26 @@
       }
     },
     "browserslist": {
-      "version": "4.3.3",
+      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.3.3.tgz",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.4.1.tgz",
-      "integrity": "sha512-6h84UD1mmHeuQ9IucX6yzBc+KBYcBBTLYt2CXtY7GYCra6iE5kOm7oM+zuGw/0tjGtbJxjm58OvxSBmogEMCRQ==",
+      "integrity": "sha512-pEBxEXg7JwaakBXjATYw/D1YZh4QUSCX/Mnd/wnqSRPPSi1U39iDhDoKGoBUcraKdxDlrYqJxSI5nNvD+dWP2A==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30000898",
+        "caniuse-lite": "^1.0.30000929",
-        "electron-to-chromium": "^1.3.81",
+        "electron-to-chromium": "^1.3.103",
-        "node-releases": "^1.0.0-alpha.15"
+        "node-releases": "^1.1.3"
       },
       "dependencies": {
         "caniuse-lite": {
-          "version": "1.0.30000899",
+          "version": "1.0.30000932",
-          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000899.tgz",
+          "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000932.tgz",
-          "integrity": "sha512-enC3zKfUCJxxwvUIsBkbHd54CtJw1KtIWvrK0JZxWD/fEN2knHaai45lndJ4xXAkyRAPyk60J3yagkKDWhfeMA==",
+          "integrity": "sha512-4bghJFItvzz8m0T3lLZbacmEY9X1Z2AtIzTr7s7byqZIOumASfr4ynDx7rtm0J85nDmx8vsgR6vnaSoeU8Oh0A==",
           "dev": true
         },
         "node-releases": {
-          "version": "1.0.0-alpha.15",
+          "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.0.0-alpha.15.tgz",
+          "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.3.tgz",
-          "integrity": "sha512-hKG6hd/g6a9OV/ARt2qrxbRhe/4WEMFohTLOB9PNyTYvvI59gICZFzt9/mMgpYUTts06qXlN8H6UjfbIRdnW8A==",
+          "integrity": "sha512-6VrvH7z6jqqNFY200kdB6HdzkgM96Oaj9v3dqGfgp6mF+cHmU4wyQKZ2/WPDRVoR0Jz9KqbamaBN0ZhdUaysUQ==",
           "dev": true,
           "requires": {
             "semver": "^5.3.0"
@@ -2780,9 +2780,9 @@
       }
     },
     "electron-to-chromium": {
-      "version": "1.3.82",
+      "version": "1.3.107",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.82.tgz",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.107.tgz",
-      "integrity": "sha512-NI4nB2IWGcU4JVT1AE8kBb/dFor4zjLHMLsOROPahppeHrR0FG5uslxMmkp/thO1MvPjM2xhlKoY29/I60s0ew==",
+      "integrity": "sha512-EEbV1rhZE6DfbZg/Dt85fyXd8S0oDNXvwgUqkQvxsVXmhNfHxDXRZXUURu/y2J6HSgk+58a56Qqk20U9X7KEbQ==",
       "dev": true
     },
     "elliptic": {
@@ -8105,11 +8105,6 @@
       "integrity": "sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=",
       "dev": true
     },
-    "tinode-sdk": {
-      "version": "0.15.8-rc1",
-      "resolved": "https://registry.npmjs.org/tinode-sdk/-/tinode-sdk-0.15.8-rc1.tgz",
-      "integrity": "sha512-139xdnrkBb6mPU4NiLuvMCZ2Ji/1WmP5WhHI7utdMirewq3l5jnQ0cF86iYBbOMaYhhnLLLsbbm4KjleP+1zHA=="
-    },
     "to-arraybuffer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",

package.json

@@ -8,7 +8,7 @@
     "@babel/preset-react": "^7.0.0",
     "babel-loader": "^8.0.4",
     "babel-plugin-react-intl": "^3.0.1",
-    "browserslist": "^4.3.3",
+    "browserslist": "^4.4.1",
     "cssnano": "^4.0.5",
     "webpack": "^4.23.1",
     "webpack-cli": "^3.1.2"

src/lib/blob-helpers.js

@@ -15,7 +15,13 @@ export function makeImageUrl(photo) {
 // Returns an object which contains destination sizes, source sizes, and offsets
 // into source (when making square images).
 export function fitImageSize(width, height, maxWidth, maxHeight, forceSquare) {
-  if (!width || !height || !maxWidth || !maxHeight) {
+  // Sanitize input
+  width = width | 0;
+  height = height | 0;
+  maxWidth = maxWidth | 0;
+  maxHeight = maxHeight | 0;
+
+  if (width <= 0 || height <= 0 || maxWidth <= 0 || maxHeight <= 0) {
     return null;
   }