From a6a1f89124c09d325a4570025df974b35158ebda Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Thu, 3 May 2018 21:52:29 +0200
Subject: handle invalid image bounds

---
 src/main/java/de/pixart/messenger/persistance/FileBackend.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'src/main/java/de/pixart/messenger/persistance/FileBackend.java')

diff --git a/src/main/java/de/pixart/messenger/persistance/FileBackend.java b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
index c4107e863..7ba41d8ad 100644
--- a/src/main/java/de/pixart/messenger/persistance/FileBackend.java
+++ b/src/main/java/de/pixart/messenger/persistance/FileBackend.java
@@ -912,7 +912,9 @@ public class FileBackend {
         if (image || video) {
             try {
                 Dimensions dimensions = image ? getImageDimensions(file) : getVideoDimensions(file);
-                body.append('|').append(dimensions.width).append('|').append(dimensions.height);
+                if (dimensions.valid()) {
+                    body.append('|').append(dimensions.width).append('|').append(dimensions.height);
+                }
             } catch (NotAVideoFile notAVideoFile) {
                 Log.d(Config.LOGTAG, "file with mime type " + file.getMimeType() + " was not a video file");
                 //fall threw
@@ -1096,6 +1098,10 @@ public class FileBackend {
         public int getMin() {
             return Math.min(width, height);
         }
+
+        public boolean valid() {
+            return width > 0 && height > 0;
+        }
     }
 
     private static class NotAVideoFile extends Exception {
-- 
cgit v1.2.3