fix memory leak when reading invalid tiff - refs mapnik#1783

PetrDlouhy · Aug 21, 2013 · 52e72ff · 52e72ff
1 parent 0ab983e
commit 52e72ff
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/tiff_reader.cpp b/src/tiff_reader.cpp
@@ -118,11 +118,12 @@ void tiff_reader::on_error(const char* /*module*/, const char* fmt, va_list argp
 void tiff_reader::init()
 {
     // TODO: error handling
-    TIFFSetWarningHandler(0);
-    TIFFSetErrorHandler(on_error);
     TIFF* tif = load_if_exists(file_name_);
     if (!tif) throw image_reader_exception( std::string("Can't load tiff file: '") + file_name_ + "'");
 
+    TIFFSetWarningHandler(0);
+    TIFFSetErrorHandler(on_error);
+
     char msg[1024];
 
     if (TIFFRGBAImageOK(tif,msg))