liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fully check thumb data size (#3529)

Browse Source 
Also, take rotation into account when falling back to
`Thumbnail::loadFromRaw()`.
This commit is contained in:
Flössie
2016-12-13 20:44:05 +01:00
parent 1f080e0438
commit 23f17bd9bc
3 changed files with 50 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
rtengine/rtthumbnail.cc
View File

@@ -41,6 +41,25 @@
#include "StopWatch.h"
namespace
{
bool checkRawImageThumb(const rtengine::RawImage& raw_image)
{
if (!raw_image.is_supportedThumb()) {
return false;
}
const std::size_t length =
fdata(raw_image.get_thumbOffset(), raw_image.get_file())[1] != 0xD8 && raw_image.is_ppmThumb()
? raw_image.get_thumbWidth() * raw_image.get_thumbHeight() * (raw_image.get_thumbBPS() / 8) * 3
: raw_image.get_thumbLength();
return raw_image.get_thumbOffset() + length < raw_image.get_file()->size;
}
}
extern Options options;
namespace rtengine
@@ -175,8 +194,8 @@ Thumbnail* Thumbnail::loadQuickFromRaw (const Glib::ustring& fname, RawMetaDataL
int err = 1;
// see if it is something we support
if ( ri->is_supportedThumb() && ri->get_thumbOffset() < ri->get_file()->size ) {
// See if it is something we support
if (checkRawImageThumb(*ri)) {
const char* data((const char*)fdata(ri->get_thumbOffset(), ri->get_file()));
if ( (unsigned char)data[1] == 0xd8 ) {
@@ -491,6 +510,17 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
tmph = high;
}
const bool rotate_90 =
rotate
&& (
ri->get_rotateDegree() == 90
|| ri->get_rotateDegree() == 270
);
if (rotate_90) {
std::swap(tmpw, tmph);
}
if (fixwh == 1) { // fix height, scale width
w = tmpw * h / tmph;
} else {
@@ -501,8 +531,11 @@ Thumbnail* Thumbnail::loadFromRaw (const Glib::ustring& fname, RawMetaDataLocati
delete tpp->thumbImg;
}
tpp->thumbImg = nullptr;
tpp->thumbImg = resizeTo<Image16>(w, h, TI_Bilinear, tmpImg);
if (rotate_90) {
tpp->thumbImg = resizeTo<Image16>(h, w, TI_Bilinear, tmpImg);
} else {
tpp->thumbImg = resizeTo<Image16>(w, h, TI_Bilinear, tmpImg);
}
delete tmpImg;