From f7e813238da85270a974e4a045242af2dda0fda0 Mon Sep 17 00:00:00 2001
From: artemp <artem@mapnik.org>
Date: Wed, 19 Nov 2014 16:17:52 +0100
Subject: [PATCH] ensure all exceptions are caught in Image ctor

---
 platform/default/image.cpp | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/platform/default/image.cpp b/platform/default/image.cpp
index 96d01ab71..9a76ef33f 100644
--- a/platform/default/image.cpp
+++ b/platform/default/image.cpp
@@ -84,12 +84,19 @@ Image::Image(std::string const& data)
     }
     catch (image_reader_exception const& ex)
     {
-        fprintf(stderr, "ImageReader: %s\n", ex.what());
+        fprintf(stderr, "Image: %s\n", ex.what());
         img.reset();
         width = 0;
         height = 0;
 
     }
+    catch (...) // catch the rest
+    {
+        fprintf(stderr, "Image: exception in constructor");
+        img.reset();
+        width = 0;
+        height = 0;
+    }
 }
 
 }