Fix coverity issues

This commit is contained in:
heckflosse
2018-11-23 00:33:30 +01:00
parent 944b901a65
commit 52ddc63f54
3 changed files with 12 additions and 6 deletions

View File

@@ -163,7 +163,7 @@ inline void RawImageSource::interpolate_row_rb (float* ar, float* ab, float* pg,
n++;
}
nonGreen2[j] = cg[j] + nonGreen / n;
nonGreen2[j] = cg[j] + nonGreen / std::max(n, 1);
// linear R-G interp. horizontally
float val1;

View File

@@ -1207,8 +1207,8 @@ Tag::Tag (TagDirectory* p, FILE* f, int base)
} else {
// read value
value = new unsigned char [valuesize + 1];
fread (value, 1, valuesize, f);
value[valuesize] = '\0';
auto readSize = fread (value, 1, valuesize, f);
value[readSize] = '\0';
}
// seek back to the saved position
@@ -2149,10 +2149,14 @@ void ExifManager::parseCIFF (int length, TagDirectory* root)
char buffer[1024];
Tag* t;
fseek (f, rml->ciffBase + length - 4, SEEK_SET);
if (fseek(f, rml->ciffBase + length - 4, SEEK_SET)) {
return;
}
int dirStart = get4 (f, INTEL) + rml->ciffBase;
fseek (f, dirStart, SEEK_SET);
if (fseek(f, dirStart, SEEK_SET)) {
return;
}
int numOfTags = get2 (f, INTEL);

View File

@@ -203,7 +203,9 @@ int main (int argc, char **argv)
// Move the old path to the new one if the new does not exist
if (Glib::file_test (Glib::build_filename (options.rtdir, "cache"), Glib::FILE_TEST_IS_DIR) && !Glib::file_test (options.cacheBaseDir, Glib::FILE_TEST_IS_DIR)) {
g_rename (Glib::build_filename (options.rtdir, "cache").c_str (), options.cacheBaseDir.c_str ());
if (g_rename (Glib::build_filename (options.rtdir, "cache").c_str (), options.cacheBaseDir.c_str ()) == -1) {
std::cout << "g_rename " << Glib::build_filename (options.rtdir, "cache").c_str () << " => " << options.cacheBaseDir.c_str () << " failed." << std::endl;
}
}
#endif