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

Avoids invalid reads which occured with Pentax K100D, patch provided by Hombre, no Issue

Browse Source
This commit is contained in:
Ingo
2014-02-06 00:49:08 +01:00
parent 906cd4ba3a
commit fa966ccd46
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rtexif/rtexif.cc
View File

@@ -569,7 +569,11 @@ TagDirectoryTable::TagDirectoryTable (TagDirectory* p, unsigned char *v,int mems
{ {
values = new unsigned char[valuesSize]; values = new unsigned char[valuesSize];
memcpy(values,v,valuesSize); memcpy(values,v,valuesSize);
for( const TagAttrib* tattr = ta; tattr->ignore != -1; tattr++){
// Security ; will avoid to read above the buffer limit if the RT's tagDirectoryTable is longer that what's in the file
int count = valuesSize/getTypeSize(type);
for(const TagAttrib* tattr = ta; tattr->ignore != -1 && tattr->ID<count; ++tattr){
Tag* newTag = new Tag (this, tattr, (values + zeroOffset+ tattr->ID*getTypeSize(type)), tattr->type == AUTO ? type : tattr->type); Tag* newTag = new Tag (this, tattr, (values + zeroOffset+ tattr->ID*getTypeSize(type)), tattr->type == AUTO ? type : tattr->type);
tags.push_back(newTag); // Here we can insert more tag in the same offset because of bitfield meaning tags.push_back(newTag); // Here we can insert more tag in the same offset because of bitfield meaning
} }
@@ -581,7 +585,10 @@ TagDirectoryTable::TagDirectoryTable (TagDirectory* p, FILE* f, int memsize,int
values = new unsigned char[valuesSize]; values = new unsigned char[valuesSize];
fread (values, 1, valuesSize, f); fread (values, 1, valuesSize, f);
for( const TagAttrib* tattr = ta; tattr->ignore != -1; tattr++){ // Security ; will avoid to read above the buffer limit if the RT's tagDirectoryTable is longer that what's in the file
int count = valuesSize/getTypeSize(type);
for(const TagAttrib* tattr = ta; tattr->ignore != -1 && tattr->ID<count; ++tattr){
Tag* newTag = new Tag (this, tattr, (values + zeroOffset+ tattr->ID*getTypeSize(type)), tattr->type == AUTO ? type : tattr->type); Tag* newTag = new Tag (this, tattr, (values + zeroOffset+ tattr->ID*getTypeSize(type)), tattr->type == AUTO ? type : tattr->type);
tags.push_back(newTag); // Here we can insert more tag in the same offset because of bitfield meaning tags.push_back(newTag); // Here we can insert more tag in the same offset because of bitfield meaning
} }

2
rtexif/rtexif.h
View File

@@ -431,7 +431,7 @@ protected:
} }
}; };
inline int getTypeSize( TagType type ); inline static int getTypeSize( TagType type );
extern const TagAttrib exifAttribs[]; extern const TagAttrib exifAttribs[];
extern const TagAttrib gpsAttribs[]; extern const TagAttrib gpsAttribs[];