Merge branch 'feature/upstrem' into develop

1 files changed, 10 insertions, 0 deletions

diff --git a/src/photos/WebPSupport.vala b/src/photos/WebPSupport.vala
index b467b24..543c889 100644
--- a/src/photos/WebPSupport.vala
+++ b/src/photos/WebPSupport.vala
@@ -209,8 +209,18 @@ private class WebpReader : PhotoFileReader {
         uint8[] buffer;
 
         FileUtils.get_data(this.get_filepath(), out buffer);
+        var features = WebP.BitstreamFeatures();
+        WebP.GetFeatures(buffer, out features);
+
+        if (features.has_animation) {
+            throw new IOError.INVALID_DATA("Animated WebP files are not yet supported");
+        }
+        
         int width, height;
         var pixdata = WebP.DecodeRGBA(buffer, out width, out height);
+        if (pixdata == null) {
+            throw new IOError.INVALID_DATA("Failed to decode WebP file");
+        }
         pixdata.length = width * height * 4;
 
         return new Gdk.Pixbuf.from_data(pixdata, Gdk.Colorspace.RGB, true, 8, width, height, width * 4);