Fixed crash when a malformed image is downloaded

1 files changed, 11 insertions, 10 deletions

@@ -180,20 +180,21 @@ void advice::run() const
 
         std::string imgstr = imgbuf.str();
         img = Magick::Blob(imgstr.c_str(), imgstr.length());
-        pic.read(img);
-        if (pic.rows() == 0)
+
+        try
         {
-          continue;
-        }
+          pic.read(img);
 
-        // Too small!
-        if (pic.columns() < 400)
+          if ((pic.rows() > 0) && (pic.columns() >= 400))
+          {
+            std::cout << url << std::endl;
+            found = true;
+          }
+        } catch (const Magick::ErrorOption& e)
         {
-          continue;
+          // Occurs when the the data downloaded from the server is malformed
+          std::cout << "Magick: " << e.what() << std::endl;
         }
-
-        std::cout << url << std::endl;
-        found = true;
       }
 
       if (!found)