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

Fix some coverity issues

Browse Source
This commit is contained in:
heckflosse 2018-11-22 13:41:10 +01:00
parent d2dcd437b4
commit c667ec4a38
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rtexif/rtexif.cc
View File

@ -368,6 +368,7 @@ void TagDirectory::addTag (Tag* tag)
// look up if it already exists: // look up if it already exists:
if (getTag (tag->getID())) { if (getTag (tag->getID())) {
delete tag; delete tag;
tag = nullptr;
} else { } else {
tags.push_back (tag); tags.push_back (tag);
} }
@ -379,6 +380,7 @@ void TagDirectory::addTagFront (Tag* tag)
// look up if it already exists: // look up if it already exists:
if (getTag (tag->getID())) { if (getTag (tag->getID())) {
delete tag; delete tag;
tag = nullptr;
} else { } else {
tags.insert (tags.begin(), tag); tags.insert (tags.begin(), tag);
} }
@ -2106,10 +2108,12 @@ void ExifManager::parseCIFF ()
TagDirectory* root = new TagDirectory (nullptr, ifdAttribs, INTEL); TagDirectory* root = new TagDirectory (nullptr, ifdAttribs, INTEL);
Tag* exif = new Tag (root, lookupAttrib (ifdAttribs, "Exif")); Tag* exif = new Tag (root, lookupAttrib (ifdAttribs, "Exif"));
exif->initSubDir (); exif->initSubDir ();
root->addTag (exif);
if (exif) {
Tag* mn = new Tag (exif->getDirectory(), lookupAttrib (exifAttribs, "MakerNote")); Tag* mn = new Tag (exif->getDirectory(), lookupAttrib (exifAttribs, "MakerNote"));
mn->initMakerNote (IFD, canonAttribs); mn->initMakerNote (IFD, canonAttribs);
root->addTag (exif);
exif->getDirectory()->addTag (mn); exif->getDirectory()->addTag (mn);
}
parseCIFF (rml->ciffLength, root); parseCIFF (rml->ciffLength, root);
root->sort (); root->sort ();
} }
@ -2510,7 +2514,7 @@ parse_leafdata (TagDirectory* root, ByteOrder order)
root->addTagFront (exif); root->addTagFront (exif);
} }
if (!exif->getDirectory()->getTag ("ISOSpeedRatings")) { if (exif && !exif->getDirectory()->getTag ("ISOSpeedRatings")) {
Tag *t = new Tag (exif->getDirectory(), exif->getDirectory()->getAttrib ("ISOSpeedRatings")); Tag *t = new Tag (exif->getDirectory(), exif->getDirectory()->getAttrib ("ISOSpeedRatings"));
t->initInt (iso_speed, LONG); t->initInt (iso_speed, LONG);
exif->getDirectory()->addTagFront (t); exif->getDirectory()->addTagFront (t);
@ -2836,7 +2840,7 @@ void ExifManager::parse (bool isRaw, bool skipIgnored)
exif->initSubDir (exifdir); exif->initSubDir (exifdir);
root->addTagFront (exif); root->addTagFront (exif);
if (!exif->getDirectory()->getTag ("ISOSpeedRatings") && exif->getDirectory()->getTag ("ExposureIndex")) { if (exif && !exif->getDirectory()->getTag ("ISOSpeedRatings") && exif->getDirectory()->getTag ("ExposureIndex")) {
Tag* niso = new Tag (exif->getDirectory(), exif->getDirectory()->getAttrib ("ISOSpeedRatings")); Tag* niso = new Tag (exif->getDirectory(), exif->getDirectory()->getAttrib ("ISOSpeedRatings"));
niso->initInt (exif->getDirectory()->getTag ("ExposureIndex")->toInt(), SHORT); niso->initInt (exif->getDirectory()->getTag ("ExposureIndex")->toInt(), SHORT);
exif->getDirectory()->addTagFront (niso); exif->getDirectory()->addTagFront (niso);