better code safety

avoid UMR and division by zero
NatronGitHub · Sep 29, 2021 · c09fc39 · c09fc39
1 parent 0d69b7c
commit c09fc39
Show file tree

Hide file tree

Showing 31 changed files with 68 additions and 59 deletions.
diff --git a/Add/Add.cpp b/Add/Add.cpp
@@ -307,8 +307,8 @@ class AddProcessor
         unused(rs);
         assert(nComponents == 1 || nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/Clamp/Clamp.cpp b/Clamp/Clamp.cpp
@@ -361,8 +361,8 @@ class ImageClamper
     void processClampTo(const OfxRectI& procWindow, const OfxPointD& rs)
     {
         unused(rs);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
 
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {

diff --git a/ClipTest/ClipTest.cpp b/ClipTest/ClipTest.cpp
@@ -262,8 +262,8 @@ class ClipTestProcessor
         unused(rs);
         assert(nComponents == 1 || nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/ColorCorrect/ColorCorrect.cpp b/ColorCorrect/ColorCorrect.cpp
@@ -632,8 +632,8 @@ class ColorCorrecter
         assert( (!processR && !processG && !processB) || (nComponents == 3 || nComponents == 4) );
         assert( !processA || (nComponents == 1 || nComponents == 4) );
         assert(nComponents == 3 || nComponents == 4);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/ColorLookup/ColorLookup.cpp b/ColorLookup/ColorLookup.cpp
@@ -436,7 +436,7 @@ class ColorLookupProcessor
         unused(rs);
         assert(nComponents == 1 || nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float tmpPix[4];
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;
@@ -542,7 +542,7 @@ class ColorLookupProcessor
                     ofxsMaskMixPix<PIX, nComponents, maxValue, true>(tmpPix, x, y, srcPix, _doMasking, _maskImg, (float)_mix, _maskInvert, dstPix);
                 } else {
                     //assert(nComponents == 4);
-                    float unpPix[4];
+                    float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
                     ofxsUnPremult<PIX, nComponents, maxValue>(srcPix, unpPix, _premult, _premultChannel);
                     float r = unpPix[0];
                     float g = unpPix[1];
@@ -870,7 +870,7 @@ class HistogramProcessor
             PIX *dstPix = (PIX *) _dstImg->getPixelAddress(procWindow.x1, y);
 
             for (int x = procWindow.x1; x < procWindow.x2; ++x) {
-                float unpPix[4];
+                float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
                 ofxsUnPremult<PIX, nComponents, maxValue>(dstPix, unpPix, _premult, _premultChannel);
 
                 for (int c = 0; c < (std::min)(nComponents, 3); ++c) {

diff --git a/ColorMatrix/ColorMatrix.cpp b/ColorMatrix/ColorMatrix.cpp
@@ -305,8 +305,8 @@ class ColorMatrixProcessor
         unused(rs);
         assert(nComponents == 1 || nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/ColorSuppress/ColorSuppress.cpp b/ColorSuppress/ColorSuppress.cpp
@@ -276,8 +276,8 @@ class ColorSuppressProcessor
         unused(rs);
         assert(nComponents == 1 || nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/ColorTransform/ColorTransform.cpp b/ColorTransform/ColorTransform.cpp
@@ -261,8 +261,8 @@ class ColorTransformProcessor
         unused(rs);
         assert(nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         const bool dounpremult = _premult && fromRGB(transform);
         const bool dopremult = _premult && toRGB(transform);
 

diff --git a/ColorWheel/ColorWheel.cpp b/ColorWheel/ColorWheel.cpp
@@ -219,6 +219,9 @@ class ColorWheelProcessor
     {
         double par = _dstImg->getPixelAspectRatio();
         OfxPointD c; // center position in pixel
+        if (par <= 0.) {
+            par = 1.;
+        }
 
         Coords::toPixelSub(_center, rs, par, &c);
         OfxPointD r; // radius in pixel

diff --git a/DenoiseSharpen/DenoiseSharpen.cpp b/DenoiseSharpen/DenoiseSharpen.cpp
@@ -2545,7 +2545,7 @@ DenoiseSharpenPlugin::renderForBitDepth(const RenderArguments &args)
 
         for (int x = p.srcWindow.x1; x < p.srcWindow.x2; x++) {
             const PIX *srcPix = (const PIX *)  (src.get() ? src->getPixelAddress(x, y) : 0);
-            float unpPix[4] = {0., 0., 0., 0.};
+            float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
             ofxsUnPremult<PIX, nComponents, maxValue>(srcPix, unpPix, p.premult, p.premultChannel);
             unsigned int pix = (x - p.srcWindow.x1) + (y - p.srcWindow.y1) * iwidth;
             // convert to the appropriate color model and store in tmpPixelData
@@ -3159,7 +3159,7 @@ DenoiseSharpenPlugin::analyzeNoiseLevelsForBitDepth(const InstanceChangedArgs &a
 
         for (int x = srcWindow.x1; x < srcWindow.x2; x++) {
             const PIX *srcPix = (const PIX *)  (src.get() ? src->getPixelAddress(x, y) : 0);
-            float unpPix[4] = {0., 0., 0., 0.};
+            float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
             ofxsUnPremult<PIX, nComponents, maxValue>(srcPix, unpPix, premult, premultChannel);
             unsigned int pix = (x - srcWindow.x1) + (y - srcWindow.y1) * iwidth;
             // convert to the appropriate color model and store in tmpPixelData

diff --git a/Despill/Despill.cpp b/Despill/Despill.cpp
@@ -266,7 +266,7 @@ class DespillProcessor
     void multiThreadProcessImages(const OfxRectI& procWindow, const OfxPointD& rs) OVERRIDE FINAL
     {
         unused(rs);
-        float tmpPix[4];
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
 
         assert(nComponents == 3 || nComponents == 4);
         assert(_dstImg);

diff --git a/Distortion/Distortion.cpp b/Distortion/Distortion.cpp
@@ -956,7 +956,7 @@ DistortionProcessor<PIX, nComponents, maxValue, plugin, filter, clamp>::multiThr
     int srcy1 = int(std::ceil(_format.y1));
     int srcy2 = int(std::floor(_format.y2));
     //}
-    float tmpPix[4];
+    float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
     for (int y = procWindow.y1; y < procWindow.y2; y++) {
         if ( _effect.abort() ) {
             break;

diff --git a/Gamma/Gamma.cpp b/Gamma/Gamma.cpp
@@ -264,8 +264,8 @@ class GammaProcessor
         unused(rs);
         assert(nComponents == 1 || nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/Grade/Grade.cpp b/Grade/Grade.cpp
@@ -691,8 +691,8 @@ class GradeProcessor
         assert( !processA || (nComponents == 1 || nComponents == 4) );
         assert(nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         if ( reverse() ) {
             for (int y = procWindow.y1; y < procWindow.y2; y++) {
                 if ( _effect.abort() ) {

diff --git a/HSVTool/HSVTool.cpp b/HSVTool/HSVTool.cpp
@@ -629,8 +629,8 @@ class HSVToolProcessor
         unused(rs);
         assert(nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         // only premultiply output if keeping the source alpha
         const bool premultOut = _premult && (_outputAlpha == eOutputAlphaSource);
         for (int y = procWindow.y1; y < procWindow.y2; y++) {

diff --git a/HueCorrect/HueCorrect.cpp b/HueCorrect/HueCorrect.cpp
@@ -326,7 +326,7 @@ class HueCorrectProcessor
         unused(rs);
         assert(nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float tmpPix[4];
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;
@@ -336,7 +336,7 @@ class HueCorrectProcessor
 
             for (int x = procWindow.x1; x < procWindow.x2; x++) {
                 const PIX *srcPix = (const PIX *)  (_srcImg ? _srcImg->getPixelAddress(x, y) : 0);
-                float unpPix[4];
+                float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
                 ofxsUnPremult<PIX, nComponents, maxValue>(srcPix, unpPix, _premult, _premultChannel);
                 // ofxsUnPremult outputs normalized data
 

diff --git a/HueCorrect/HueCorrect1.cpp b/HueCorrect/HueCorrect1.cpp
@@ -320,7 +320,7 @@ class HueCorrectProcessor
         unused(rs);
         assert(nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float tmpPix[4];
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;
@@ -330,7 +330,7 @@ class HueCorrectProcessor
 
             for (int x = procWindow.x1; x < procWindow.x2; x++) {
                 const PIX *srcPix = (const PIX *)  (_srcImg ? _srcImg->getPixelAddress(x, y) : 0);
-                float unpPix[4];
+                float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
                 ofxsUnPremult<PIX, nComponents, maxValue>(srcPix, unpPix, _premult, _premultChannel);
                 // ofxsUnPremult outputs normalized data
 

diff --git a/Invert/Invert.cpp b/Invert/Invert.cpp
@@ -240,8 +240,8 @@ class ImageInverter
     void process(const OfxRectI& procWindow, const OfxPointD& rs)
     {
         unused(rs);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
 
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {

diff --git a/KeyMix/KeyMix.cpp b/KeyMix/KeyMix.cpp
@@ -170,7 +170,7 @@ class KeyMixProcessor
     void multiThreadProcessImages(const OfxRectI& procWindow, const OfxPointD& rs) OVERRIDE FINAL
     {
         unused(rs);
-        float tmpPix[4];
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int c = 0; c < 4; ++c) {
             tmpPix[c] = 0;
         }

diff --git a/Log2Lin/Log2Lin.cpp b/Log2Lin/Log2Lin.cpp
@@ -299,8 +299,8 @@ class PLog2LinProcessor
         unused(rs);
         assert( (!processR && !processG && !processB) || (nComponents == 3 || nComponents == 4) );
         assert(nComponents == 3 || nComponents == 4);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;
@@ -403,8 +403,8 @@ class PLin2LogProcessor
         unused(rs);
         assert( (!processR && !processG && !processB) || (nComponents == 3 || nComponents == 4) );
         assert(nComponents == 3 || nComponents == 4);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/Multiply/Multiply.cpp b/Multiply/Multiply.cpp
@@ -262,8 +262,8 @@ class MultiplyProcessor
         unused(rs);
         assert(nComponents == 1 || nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/PLogLin/PLogLin.cpp b/PLogLin/PLogLin.cpp
@@ -309,8 +309,8 @@ class PLog2LinProcessor
         unused(rs);
         assert( (!processR && !processG && !processB) || (nComponents == 3 || nComponents == 4) );
         assert(nComponents == 3 || nComponents == 4);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;
@@ -407,8 +407,8 @@ class PLin2LogProcessor
         unused(rs);
         assert( (!processR && !processG && !processB) || (nComponents == 3 || nComponents == 4) );
         assert(nComponents == 3 || nComponents == 4);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/Quantize/Quantize.cpp b/Quantize/Quantize.cpp
@@ -382,8 +382,8 @@ class QuantizeProcessor
         assert( (!processR && !processG && !processB) || (nComponents == 3 || nComponents == 4) );
         assert( !processA || (nComponents == 1 || nComponents == 4) );
         assert(nComponents == 3 || nComponents == 4);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         // set up a random number generator and set the seed
 #ifdef USE_RANDOMGENERATOR
         RandomGenerator randy;

diff --git a/Radial/Radial.cpp b/Radial/Radial.cpp
@@ -336,8 +336,11 @@ class RadialProcessor
         assert( (!processR && !processG && !processB) || (nComponents == 3 || nComponents == 4) );
         assert( !processA || (nComponents == 1 || nComponents == 4) );
 
-        float tmpPix[4];
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         double par = _dstImg->getPixelAspectRatio();
+        if (par <= 0.) {
+            par = 1.;
+        }
 
         // center of the ellipse
         OfxPointD c_canonical = { ( _btmLeft.x + (_btmLeft.x + _size.x) ) / 2, ( _btmLeft.y + (_btmLeft.y + _size.y) ) / 2 };

diff --git a/Ramp/Ramp.cpp b/Ramp/Ramp.cpp
@@ -311,7 +311,7 @@ class RampProcessor
     template<bool processR, bool processG, bool processB, bool processA, RampTypeEnum type>
     void processForType(const OfxRectI& procWindow, const OfxPointD& rs)
     {
-        float tmpPix[4];
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         const double norm2 = (_point1.x - _point0.x) * (_point1.x - _point0.x) + (_point1.y - _point0.y) * (_point1.y - _point0.y);
         const double nx = norm2 == 0. ? 0. : (_point1.x - _point0.x) / norm2;
         const double ny = norm2 == 0. ? 0. : (_point1.y - _point0.y) / norm2;

diff --git a/Rectangle/Rectangle.cpp b/Rectangle/Rectangle.cpp
@@ -349,8 +349,11 @@ class RectangleProcessor
         assert( (!processR && !processG && !processB) || (nComponents == 3 || nComponents == 4) );
         assert( !processA || (nComponents == 1 || nComponents == 4) );
 
-        float tmpPix[4];
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         double par = _dstImg->getPixelAspectRatio();
+        if (par <= 0.) {
+            par = 1.;
+        }
         OfxPointD btmLeft_canonical = { _btmLeft.x, _btmLeft.y };
         OfxPointD topRight_canonical = { _btmLeft.x + _size.x, _btmLeft.y + _size.y };
         OfxPointD btmLeft; // btmLeft position in pixel
@@ -449,7 +452,7 @@ class RectangleProcessor
                                 tmpPix[3] = (float)_color0.a;
                             } else {
                                 // always consider the value closest top the center to avoid discontinuities/artifacts
-                                if (_softness == 0) {
+                                if (_softness <= 0) {
                                     // solid color
                                     tmpPix[0] = (float)_color1.r;
                                     tmpPix[1] = (float)_color1.g;

diff --git a/Saturation/Saturation.cpp b/Saturation/Saturation.cpp
@@ -375,8 +375,8 @@ class SaturationProcessor
         assert( !processA || (nComponents == 1 || nComponents == 4) );
         assert(nComponents == 3 || nComponents == 4);
         assert(_dstImg);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/SupportExt b/SupportExt
diff --git a/Templates/MaskableFilter.cpp b/Templates/MaskableFilter.cpp
@@ -246,8 +246,8 @@ class MaskableFilterProcessor
         assert( (!processR && !processG && !processB) || (nComponents == 3 || nComponents == 4) );
         assert( !processA || (nComponents == 1 || nComponents == 4) );
         assert(nComponents == 3 || nComponents == 4);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/Templates/MixableFilter.cpp b/Templates/MixableFilter.cpp
@@ -235,8 +235,8 @@ class MixableFilterProcessor
         assert( (!processR && !processG && !processB) || (nComponents == 3 || nComponents == 4) );
         assert( !processA || (nComponents == 1 || nComponents == 4) );
         assert(nComponents == 3 || nComponents == 4);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;

diff --git a/Templates/SimpleFilter.cpp b/Templates/SimpleFilter.cpp
@@ -231,8 +231,8 @@ class SimpleFilterProcessor
         assert( (!processR && !processG && !processB) || (nComponents == 3 || nComponents == 4) );
         assert( !processA || (nComponents == 1 || nComponents == 4) );
         assert(nComponents == 3 || nComponents == 4);
-        float unpPix[4];
-        float tmpPix[4];
+        float unpPix[4] = {0.f, 0.f, 0.f, 0.f};
+        float tmpPix[4] = {0.f, 0.f, 0.f, 0.f};
         for (int y = procWindow.y1; y < procWindow.y2; y++) {
             if ( _effect.abort() ) {
                 break;