From a6cf24bc134a280e84e128a5e63461f1e892465f Mon Sep 17 00:00:00 2001
From: heckflosse <heckflosse67@gmx.de>
Date: Mon, 12 Jun 2017 23:57:18 +0200
Subject: [PATCH] Fix some coverity issues

---
 rtengine/imagedata.cc       |  4 ++--
 rtengine/ipwavelet.cc       |  4 ++++
 rtengine/rawimagesource.cc  | 12 ++++++------
 rtengine/rawimagesource_i.h |  4 ++--
 rtengine/rtthumbnail.cc     | 30 +++++++++++++++++-------------
 5 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/rtengine/imagedata.cc b/rtengine/imagedata.cc
index 829a0b286..369be2f9a 100644
--- a/rtengine/imagedata.cc
+++ b/rtengine/imagedata.cc
@@ -362,7 +362,7 @@ void ImageData::extractInfo ()
                     if (!lensOk && mnote->getTag ("Lens")) {
                         std::string ldata = mnote->getTag ("Lens")->valueToString ();
                         size_t i = 0, j = 0;
-                        double n[4];
+                        double n[4] = {0.0};
 
                         for (int m = 0; m < 4; m++) {
                             while (i < ldata.size() && ldata[i] != '/') {
@@ -380,7 +380,7 @@ void ImageData::extractInfo ()
                             int den = atoi(ldata.substr(j, i).c_str());
                             j = i + 2;
                             i += 2;
-                            n[m] = (double) nom / den;
+                            n[m] = (double) nom / std::max(den,1);
                         }
 
                         std::ostringstream str;
diff --git a/rtengine/ipwavelet.cc b/rtengine/ipwavelet.cc
index cbde6aef1..70b3be330 100644
--- a/rtengine/ipwavelet.cc
+++ b/rtengine/ipwavelet.cc
@@ -1265,6 +1265,10 @@ SSEFUNCTION void ImProcFunctions::ip_wavelet(LabImage * lab, LabImage * dst, int
         delete dsttmp;
     }
 
+#ifdef _DEBUG
+    delete MunsDebugInfo;
+#endif
+
 }
 
 #undef TS
diff --git a/rtengine/rawimagesource.cc b/rtengine/rawimagesource.cc
index f54d744c4..98f4ef8f7 100644
--- a/rtengine/rawimagesource.cc
+++ b/rtengine/rawimagesource.cc
@@ -5165,9 +5165,9 @@ ColorTemp RawImageSource::getSpotWB (std::vector<Coord2D> &red, std::vector<Coor
                 }
             }
 
-            rloc /= rnbrs;
-            gloc /= gnbrs;
-            bloc /= bnbrs;
+            rloc /= std::max(rnbrs, 1);
+            gloc /= std::max(gnbrs, 1);
+            bloc /= std::max(bnbrs, 1);
 
             if (rloc * initialGain < 64000. && gloc * initialGain < 64000. && bloc * initialGain < 64000.) {
                 reds += rloc;
@@ -5201,9 +5201,9 @@ ColorTemp RawImageSource::getSpotWB (std::vector<Coord2D> &red, std::vector<Coor
                 }
             }
 
-            rloc /= rnbrs;
-            gloc /= gnbrs;
-            bloc /= bnbrs;
+            rloc /= std::max(rnbrs, 1);
+            gloc /= std::max(gnbrs, 1);
+            bloc /= std::max(bnbrs, 1);
 
             if (rloc * initialGain < 64000. && gloc * initialGain < 64000. && bloc * initialGain < 64000.) {
                 reds += rloc;
diff --git a/rtengine/rawimagesource_i.h b/rtengine/rawimagesource_i.h
index 1cd25d6fc..cfa531a88 100644
--- a/rtengine/rawimagesource_i.h
+++ b/rtengine/rawimagesource_i.h
@@ -243,7 +243,7 @@ inline void RawImageSource::interpolate_row_rb (float* ar, float* ab, float* pg,
                     n++;
                 }
 
-                r = cg[j] + r / n;
+                r = cg[j] + r / std::max(n, 1);
 
                 ar[j] = r;
             } else {
@@ -368,7 +368,7 @@ inline void RawImageSource::interpolate_row_rb_mul_pp (float* ar, float* ab, flo
                     n++;
                 }
 
-                r = g_mul * cg[j] + r / n;
+                r = g_mul * cg[j] + r / std::max(n, 1);
 
                 ar[jx] = r;
             } else {
diff --git a/rtengine/rtthumbnail.cc b/rtengine/rtthumbnail.cc
index 2854df91a..742e667cb 100644
--- a/rtengine/rtthumbnail.cc
+++ b/rtengine/rtthumbnail.cc
@@ -1988,21 +1988,25 @@ bool Thumbnail::writeData  (const Glib::ustring& fname)
 bool Thumbnail::readEmbProfile  (const Glib::ustring& fname)
 {
 
-    FILE* f = g_fopen (fname.c_str (), "rb");
+    embProfileData = nullptr;
+    embProfile = nullptr;
+    embProfileLength = 0;
 
-    if (!f) {
-        embProfileData = nullptr;
-        embProfile = nullptr;
-        embProfileLength = 0;
-    } else {
-        fseek (f, 0, SEEK_END);
-        embProfileLength = ftell (f);
-        fseek (f, 0, SEEK_SET);
-        embProfileData = new unsigned char[embProfileLength];
-        fread (embProfileData, 1, embProfileLength, f);
+    FILE* f = g_fopen (fname.c_str (), "rb");
+    if (f) {
+        if(!fseek (f, 0, SEEK_END)) {
+            int profileLength = ftell (f);
+            if(profileLength > 0) {
+                embProfileLength = profileLength;
+                if(!fseek (f, 0, SEEK_SET)) {
+                    embProfileData = new unsigned char[embProfileLength];
+                    fread (embProfileData, 1, embProfileLength, f);
+                    embProfile = cmsOpenProfileFromMem (embProfileData, embProfileLength);
+                }
+            }
+        }
         fclose (f);
-        embProfile = cmsOpenProfileFromMem (embProfileData, embProfileLength);
-        return true;
+        return embProfile != nullptr;
     }
 
     return false;