Expose underlying error message for invalid input #1505

This commit is contained in:
Lovell Fuller
2019-01-12 16:10:25 +00:00
parent 93ad9d4a4a
commit 9dd6510de6
6 changed files with 20 additions and 5 deletions

View File

@@ -245,8 +245,8 @@ namespace sharp {
if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
SetDensity(image, descriptor->density);
}
} catch (...) {
throw vips::VError("Input buffer has corrupt header");
} catch (vips::VError const &err) {
throw vips::VError(std::string("Input buffer has corrupt header: ") + err.what());
}
} else {
throw vips::VError("Input buffer contains unsupported image format");
@@ -287,8 +287,8 @@ namespace sharp {
if (imageType == ImageType::SVG || imageType == ImageType::PDF || imageType == ImageType::MAGICK) {
SetDensity(image, descriptor->density);
}
} catch (...) {
throw vips::VError("Input file has corrupt header");
} catch (vips::VError const &err) {
throw vips::VError(std::string("Input file has corrupt header: ") + err.what());
}
} else {
throw vips::VError("Input file is missing or of an unsupported image format");