Merge pull request opencv#9025 from mshabunin:fix-static-3

alalek · alalek · commit 324851882ab9 · 2017-06-28T20:50:21.000Z
diff --git a/modules/calib3d/src/fisheye.cpp b/modules/calib3d/src/fisheye.cpp
@@ -42,6 +42,7 @@
 
 #include "precomp.hpp"
 #include "fisheye.hpp"
+#include <limits>
 
 namespace cv { namespace
 {
@@ -760,7 +761,7 @@ double cv::fisheye::calibrate(InputArrayOfArrays objectPoints, InputArrayOfArray
 
 
     //-------------------------------Optimization
-    for(int iter = 0; ; ++iter)
+    for(int iter = 0; iter <= std::numeric_limits<int>::max(); ++iter)
     {
         if ((criteria.type == 1 && iter >= criteria.maxCount)  ||
             (criteria.type == 2 && change <= criteria.epsilon) ||
diff --git a/modules/core/src/command_line_parser.cpp b/modules/core/src/command_line_parser.cpp
@@ -276,10 +276,10 @@ CommandLineParser& CommandLineParser::operator = (const CommandLineParser& parse
 {
     if( this != &parser )
     {
+        CV_XADD(&parser.impl->refcount, 1);
         if(CV_XADD(&impl->refcount, -1) == 1)
             delete impl;
         impl = parser.impl;
-        CV_XADD(&impl->refcount, 1);
     }
     return *this;
 }
diff --git a/modules/core/src/copy.cpp b/modules/core/src/copy.cpp
@@ -283,8 +283,9 @@ void Mat::copyTo( OutputArray _dst ) const
         }
         _dst.create( dims, size.p, type() );
         UMat dst = _dst.getUMat();
-
+        CV_Assert(dst.u != NULL);
         size_t i, sz[CV_MAX_DIM] = {0}, dstofs[CV_MAX_DIM], esz = elemSize();
+        CV_Assert(dims >= 0 && dims < CV_MAX_DIM);
         for( i = 0; i < (size_t)dims; i++ )
             sz[i] = size.p[i];
         sz[dims-1] *= esz;
diff --git a/modules/core/src/datastructs.cpp b/modules/core/src/datastructs.cpp
@@ -2547,6 +2547,7 @@ cvSetAdd( CvSet* set, CvSetElem* element, CvSetElem** inserted_element )
 CV_IMPL void
 cvSetRemove( CvSet* set, int index )
 {
+    CV_Assert(set != NULL);
     CvSetElem* elem = cvGetSetElem( set, index );
     if( elem )
         cvSetRemoveByPtr( set, elem );
diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp
@@ -1129,7 +1129,7 @@ Mat Mat::diag(const Mat& d)
 
 int Mat::checkVector(int _elemChannels, int _depth, bool _requireContinuous) const
 {
-    return (depth() == _depth || _depth <= 0) &&
+    return data && (depth() == _depth || _depth <= 0) &&
         (isContinuous() || !_requireContinuous) &&
         ((dims == 2 && (((rows == 1 || cols == 1) && channels() == _elemChannels) ||
                         (cols == _elemChannels && channels() == 1))) ||
diff --git a/modules/core/src/persistence.cpp b/modules/core/src/persistence.cpp
@@ -804,7 +804,7 @@ cvGetFileNode( CvFileStorage* fs, CvFileNode* _map_node,
 
         if( !map_node )
             map_node = (CvFileNode*)cvGetSeqElem( fs->roots, k );
-
+        CV_Assert(map_node != NULL);
         if( !CV_NODE_IS_MAP(map_node->tag) )
         {
             if( (!CV_NODE_IS_SEQ(map_node->tag) || map_node->data.seq->total != 0) &&
@@ -6777,6 +6777,7 @@ cvLoad( const char* filename, CvMemStorage* memstorage,
             CvSeqReader reader;
 
             node = (CvFileNode*)cvGetSeqElem( (*fs)->roots, k );
+            CV_Assert(node != NULL);
             if( !CV_NODE_IS_MAP( node->tag ))
                 return 0;
             seq = node->data.seq;
diff --git a/modules/core/src/system.cpp b/modules/core/src/system.cpp
@@ -1193,10 +1193,13 @@ Mutex::Mutex(const Mutex& m)
 
 Mutex& Mutex::operator = (const Mutex& m)
 {
-    CV_XADD(&m.impl->refcount, 1);
-    if( CV_XADD(&impl->refcount, -1) == 1 )
-        delete impl;
-    impl = m.impl;
+    if (this != &m)
+    {
+        CV_XADD(&m.impl->refcount, 1);
+        if( CV_XADD(&impl->refcount, -1) == 1 )
+            delete impl;
+        impl = m.impl;
+    }
     return *this;
 }
 
diff --git a/modules/core/src/trace.cpp b/modules/core/src/trace.cpp
@@ -225,6 +225,11 @@ Region::LocationExtraData::LocationExtraData(const LocationStaticStorage& locati
         ittHandle_name = __itt_string_handle_create(location.name);
         ittHandle_filename = __itt_string_handle_create(location.filename);
     }
+    else
+    {
+        ittHandle_name = 0;
+        ittHandle_filename = 0;
+    }
 #endif
 }
 
@@ -1019,6 +1024,10 @@ struct TraceArg::ExtraData
             //     Consecutive calls to __itt_string_handle_create with the same name return the same value.
             ittHandle_name = __itt_string_handle_create(arg.name);
         }
+        else
+        {
+            ittHandle_name = 0;
+        }
 #endif
     }
 };
diff --git a/modules/dnn/src/dnn.cpp b/modules/dnn/src/dnn.cpp
@@ -317,9 +317,9 @@ class BackendWrapManager
 
 struct LayerData
 {
-    LayerData() {}
+    LayerData() : id(-1), flag(0) {}
     LayerData(int _id, const String &_name, const String &_type, LayerParams &_params)
-        : id(_id), name(_name), type(_type), params(_params)
+        : id(_id), name(_name), type(_type), params(_params), flag(0)
     {
         //add logging info
         params.name = name;
diff --git a/modules/dnn/src/layers/convolution_layer.cpp b/modules/dnn/src/layers/convolution_layer.cpp
@@ -287,7 +287,10 @@ class ConvolutionLayerImpl : public BaseConvolutionLayerImpl
         bool is1x1_;
         bool useAVX2;
 
-        ParallelConv() {}
+        ParallelConv()
+            : input_(0), weights_(0), output_(0), ngroups_(0), nstripes_(0),
+              is1x1_(false), useAVX2(false)
+        {}
 
         static void run( const Mat& input, Mat& output, const Mat& weights,
                          const std::vector<float>& biasvec,
@@ -921,7 +924,11 @@ class DeConvolutionLayerImpl : public BaseConvolutionLayerImpl
         int nstripes;
         bool is1x1;
 
-        Col2ImInvoker() {}
+        Col2ImInvoker()
+            : data_col(0), biasvec(0), channels(0), height(0), width(0),
+              kernel_h(0), kernel_w(0), pad_h(0), pad_w(0), stride_h(0), stride_w(0), data_im(0),
+              height_col(0), width_col(0), nstripes(0), is1x1(0)
+        {}
 
         static void run(const float* data_col,
                         int channels, int height, int width,
diff --git a/modules/dnn/src/layers/elementwise_layers.cpp b/modules/dnn/src/layers/elementwise_layers.cpp
@@ -105,7 +105,7 @@ class ElementWiseLayer : public Func::Layer
         }
     };
 
-    ElementWiseLayer(const Func &f=Func()) { func = f; }
+    ElementWiseLayer(const Func &f=Func()) : run_parallel(false) { func = f; }
 
     virtual bool supportBackend(int backendId)
     {
diff --git a/modules/dnn/src/layers/permute_layer.cpp b/modules/dnn/src/layers/permute_layer.cpp
@@ -83,10 +83,10 @@ class PermuteLayerImpl : public PermuteLayer
     }
 
     PermuteLayerImpl(const LayerParams &params)
+        : _count(0), _needsPermute(false), _numAxes(0)
     {
         if (!params.has("order"))
         {
-            _needsPermute = false;
             return;
         }
 
diff --git a/modules/dnn/src/layers/prior_box_layer.cpp b/modules/dnn/src/layers/prior_box_layer.cpp
@@ -160,6 +160,7 @@ class PriorBoxLayerImpl : public PriorBoxLayer
     }
 
     PriorBoxLayerImpl(const LayerParams &params)
+        : _boxWidth(0), _boxHeight(0)
     {
         setParamsFrom(params);
         _minSize = getParameter<unsigned>(params, "min_size");
diff --git a/modules/dnn/src/layers/recurrent_layers.cpp b/modules/dnn/src/layers/recurrent_layers.cpp
@@ -94,6 +94,7 @@ class LSTMLayerImpl : public LSTMLayer
 public:
 
     LSTMLayerImpl(const LayerParams& params)
+        : numTimeStamps(0), numSamples(0)
     {
         setParamsFrom(params);
         type = "LSTM";
@@ -307,6 +308,7 @@ class RNNLayerImpl : public RNNLayer
 public:
 
     RNNLayerImpl(const LayerParams& params)
+        : numX(0), numH(0), numO(0), numSamples(0), numTimestamps(0), numSamplesTotal(0), dtype(0)
     {
         setParamsFrom(params);
         type = "RNN";
diff --git a/modules/dnn/src/torch/THDiskFile.cpp b/modules/dnn/src/torch/THDiskFile.cpp
@@ -556,6 +556,8 @@ static long THDiskFile_readString(THFile *self, const char *format, char **str_)
         total += TBRS_BSZ;
         p = (char*)THRealloc(p, total);
       }
+      if (p == NULL)
+        THError("read error: failed to allocate buffer");
       if (fgets(p+pos, total-pos, dfself->handle) == NULL) /* eof? */
       {
         if(pos == 0L)
diff --git a/modules/dnn/src/torch/torch_importer.cpp b/modules/dnn/src/torch/torch_importer.cpp
@@ -876,7 +876,7 @@ struct TorchImporter : public ::cv::dnn::Importer
                 return mergeId;
             }
             else if (module->thName == "ConcatTable") {
-                int newId, splitId;
+                int newId = -1, splitId;
                 LayerParams splitParams;
 
                 splitId = net.addLayer(generateLayerName("torchSplit"), "Split", splitParams);
diff --git a/modules/features2d/src/brisk.cpp b/modules/features2d/src/brisk.cpp
@@ -720,6 +720,7 @@ BRISK_Impl::computeDescriptorsAndOrOrientation(InputArray _image, InputArray _ma
         const BriskLongPair* max = longPairs_ + noLongPairs_;
         for (BriskLongPair* iter = longPairs_; iter < max; ++iter)
         {
+          CV_Assert(iter->i < points_ && iter->j < points_);
           t1 = *(_values + iter->i);
           t2 = *(_values + iter->j);
           const int delta_t = (t1 - t2);
diff --git a/modules/flann/include/opencv2/flann/flann_base.hpp b/modules/flann/include/opencv2/flann/flann_base.hpp
@@ -80,9 +80,11 @@ NNIndex<Distance>* load_saved_index(const Matrix<typename Distance::ElementType>
     }
     IndexHeader header = load_header(fin);
     if (header.data_type != Datatype<ElementType>::type()) {
+        fclose(fin);
         throw FLANNException("Datatype of saved index is different than of the one to be created.");
     }
     if ((size_t(header.rows) != dataset.rows)||(size_t(header.cols) != dataset.cols)) {
+        fclose(fin);
         throw FLANNException("The index saved belongs to a different dataset");
     }
 
diff --git a/modules/highgui/src/window_gtk.cpp b/modules/highgui/src/window_gtk.cpp
@@ -1617,6 +1617,10 @@ CV_IMPL void cvSetTrackbarPos( const char* trackbar_name, const char* window_nam
         if( pos > trackbar->maxval )
             pos = trackbar->maxval;
     }
+    else
+    {
+        CV_ERROR( CV_StsNullPtr, "No trackbar found" );
+    }
 
     CV_LOCK_MUTEX();
 
diff --git a/modules/imgcodecs/src/bitstrm.cpp b/modules/imgcodecs/src/bitstrm.cpp
@@ -76,6 +76,7 @@ RBaseStream::RBaseStream()
 {
     m_start = m_end = m_current = 0;
     m_file = 0;
+    m_block_pos = 0;
     m_block_size = BS_DEF_BLOCK_SIZE;
     m_is_opened = false;
     m_allocated = false;
diff --git a/modules/imgcodecs/src/grfmt_exr.cpp b/modules/imgcodecs/src/grfmt_exr.cpp
@@ -208,9 +208,12 @@ bool  ExrDecoder::readData( Mat& img )
 
     xstep = m_native_depth ? 4 : 1;
 
+    AutoBuffer<char> copy_buffer;
+
     if( !m_native_depth || (!color && m_iscolor ))
     {
-        buffer = (char *)new float[ m_width * 3 ];
+        copy_buffer.allocate(sizeof(float) * m_width * 3);
+        buffer = copy_buffer;
         ystep = 0;
     }
     else
@@ -388,11 +391,6 @@ bool  ExrDecoder::readData( Mat& img )
 
     close();
 
-    if( !m_native_depth || (!color && m_iscolor ))
-    {
-        delete[] buffer;
-    }
-
     return result;
 }
 
diff --git a/modules/imgcodecs/src/grfmt_jpeg.cpp b/modules/imgcodecs/src/grfmt_jpeg.cpp
@@ -364,7 +364,7 @@ int my_jpeg_load_dht (struct jpeg_decompress_struct *info, unsigned char *dht,
 
        if (index & 0x10)
        {
-           index -= 0x10;
+           index &= ~0x10;
            hufftbl = &ac_tables[index];
        }
        else
diff --git a/modules/imgproc/src/contours.cpp b/modules/imgproc/src/contours.cpp
@@ -525,7 +525,7 @@ icvFetchContour( schar                  *ptr,
     int             prev_s = -1, s, s_end;
     int             method = _method - 1;
 
-    assert( (unsigned) _method <= CV_CHAIN_APPROX_SIMPLE );
+    CV_DbgAssert( (unsigned) _method <= CV_CHAIN_APPROX_SIMPLE );
 
     /* initialize local state */
     CV_INIT_3X3_DELTAS( deltas, step, 1 );
@@ -557,6 +557,7 @@ icvFetchContour( schar                  *ptr,
     else
     {
         i3 = i0;
+        CV_Assert(i3 != NULL);
         prev_s = s ^ 4;
 
         /* follow border */
@@ -568,6 +569,7 @@ icvFetchContour( schar                  *ptr,
             while( s < MAX_SIZE - 1 )
             {
                 i4 = i3 + deltas[++s];
+                CV_Assert(i4 != NULL);
                 if( *i4 != 0 )
                     break;
             }
@@ -615,7 +617,7 @@ icvFetchContour( schar                  *ptr,
     if( _method != CV_CHAIN_CODE )
         cvBoundingRect( contour, 1 );
 
-    assert( (writer.seq->total == 0 && writer.seq->first == 0) ||
+    CV_DbgAssert( (writer.seq->total == 0 && writer.seq->first == 0) ||
             writer.seq->total > writer.seq->first->count ||
             (writer.seq->first->prev == writer.seq->first &&
              writer.seq->first->next == writer.seq->first) );
@@ -638,7 +640,7 @@ icvTraceContour( schar *ptr, int step, schar *stop_ptr, int is_hole )
     CV_INIT_3X3_DELTAS( deltas, step, 1 );
     memcpy( deltas + 8, deltas, 8 * sizeof( deltas[0] ));
 
-    assert( (*i0 & -2) != 0 );
+    CV_DbgAssert( (*i0 & -2) != 0 );
 
     s_end = s = is_hole ? 0 : 4;
 
@@ -650,6 +652,7 @@ icvTraceContour( schar *ptr, int step, schar *stop_ptr, int is_hole )
     while( *i1 == 0 && s != s_end );
 
     i3 = i0;
+    CV_Assert(i3 != NULL);
 
     /* check single pixel domain */
     if( s != s_end )
@@ -662,6 +665,7 @@ icvTraceContour( schar *ptr, int step, schar *stop_ptr, int is_hole )
             while( s < MAX_SIZE - 1 )
             {
                 i4 = i3 + deltas[++s];
+                CV_Assert(i4 != NULL);
                 if( *i4 != 0 )
                     break;
             }
@@ -693,8 +697,8 @@ icvFetchContourEx( schar*               ptr,
     int         prev_s = -1, s, s_end;
     int         method = _method - 1;
 
-    assert( (unsigned) _method <= CV_CHAIN_APPROX_SIMPLE );
-    assert( 1 < nbd && nbd < 128 );
+    CV_DbgAssert( (unsigned) _method <= CV_CHAIN_APPROX_SIMPLE );
+    CV_DbgAssert( 1 < nbd && nbd < 128 );
 
     /* initialize local state */
     CV_INIT_3X3_DELTAS( deltas, step, 1 );
@@ -799,7 +803,7 @@ icvFetchContourEx( schar*               ptr,
     if( _method != CV_CHAIN_CODE )
         ((CvContour*)contour)->rect = rect;
 
-    assert( (writer.seq->total == 0 && writer.seq->first == 0) ||
+    CV_DbgAssert( (writer.seq->total == 0 && writer.seq->first == 0) ||
             writer.seq->total > writer.seq->first->count ||
             (writer.seq->first->prev == writer.seq->first &&
              writer.seq->first->next == writer.seq->first) );
@@ -882,7 +886,7 @@ icvFetchContourEx_32s( int*                 ptr,
     const int   nbd0 = ccomp_val | new_flag;
     const int   nbd1 = nbd0 | right_flag;
 
-    assert( (unsigned) _method <= CV_CHAIN_APPROX_SIMPLE );
+    CV_DbgAssert( (unsigned) _method <= CV_CHAIN_APPROX_SIMPLE );
 
     /* initialize local state */
     CV_INIT_3X3_DELTAS( deltas, step, 1 );
@@ -984,7 +988,7 @@ icvFetchContourEx_32s( int*                 ptr,
     if( _method != CV_CHAIN_CODE )
         ((CvContour*)contour)->rect = rect;
 
-    assert( (writer.seq->total == 0 && writer.seq->first == 0) ||
+    CV_DbgAssert( (writer.seq->total == 0 && writer.seq->first == 0) ||
            writer.seq->total > writer.seq->first->count ||
            (writer.seq->first->prev == writer.seq->first &&
             writer.seq->first->next == writer.seq->first) );
diff --git a/modules/imgproc/src/emd.cpp b/modules/imgproc/src/emd.cpp
@@ -773,6 +773,7 @@ icvNewSolution( CvEMDState * state )
     }
 
     /* remove the leaving basic variable */
+    CV_Assert(leave_x != NULL);
     i = leave_x->i;
     j = leave_x->j;
     state->is_x[i][j] = 0;
diff --git a/modules/imgproc/src/filter.cpp b/modules/imgproc/src/filter.cpp
diff --git a/modules/imgproc/src/lsd.cpp b/modules/imgproc/src/lsd.cpp
diff --git a/modules/imgproc/src/smooth.cpp b/modules/imgproc/src/smooth.cpp
diff --git a/modules/imgproc/src/templmatch.cpp b/modules/imgproc/src/templmatch.cpp
diff --git a/modules/ml/src/tree.cpp b/modules/ml/src/tree.cpp
diff --git a/modules/objdetect/src/cascadedetect.cpp b/modules/objdetect/src/cascadedetect.cpp
diff --git a/modules/shape/src/emdL1.cpp b/modules/shape/src/emdL1.cpp
diff --git a/modules/superres/src/btv_l1.cpp b/modules/superres/src/btv_l1.cpp
diff --git a/modules/superres/src/input_array_utility.cpp b/modules/superres/src/input_array_utility.cpp
diff --git a/modules/video/src/lkpyramid.cpp b/modules/video/src/lkpyramid.cpp
diff --git a/modules/videoio/src/cap_images.cpp b/modules/videoio/src/cap_images.cpp

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@`
`42`	`42`
`43`	`43`	`#include "precomp.hpp"`
`44`	`44`	`#include "fisheye.hpp"`
	`45`	`+#include <limits>`
`45`	`46`
`46`	`47`	`namespace cv { namespace`
`47`	`48`	`{`
`@@ -760,7 +761,7 @@ double cv::fisheye::calibrate(InputArrayOfArrays objectPoints, InputArrayOfArray`
`760`	`761`
`761`	`762`
`762`	`763`	`//-------------------------------Optimization`
`763`		`- for(int iter = 0; ; ++iter)`
	`764`	`+ for(int iter = 0; iter <= std::numeric_limits<int>::max(); ++iter)`
`764`	`765`	`{`
`765`	`766`	`if ((criteria.type == 1 && iter >= criteria.maxCount) \|\|`
`766`	`767`	`(criteria.type == 2 && change <= criteria.epsilon) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -276,10 +276,10 @@ CommandLineParser& CommandLineParser::operator = (const CommandLineParser& parse`
`276`	`276`	`{`
`277`	`277`	`if( this != &parser )`
`278`	`278`	`{`
	`279`	`+ CV_XADD(&parser.impl->refcount, 1);`
`279`	`280`	`if(CV_XADD(&impl->refcount, -1) == 1)`
`280`	`281`	`delete impl;`
`281`	`282`	`impl = parser.impl;`
`282`		`- CV_XADD(&impl->refcount, 1);`
`283`	`283`	`}`
`284`	`284`	`return *this;`
`285`	`285`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2547,6 +2547,7 @@ cvSetAdd( CvSet* set, CvSetElem* element, CvSetElem** inserted_element )`
`2547`	`2547`	`CV_IMPL void`
`2548`	`2548`	`cvSetRemove( CvSet* set, int index )`
`2549`	`2549`	`{`
	`2550`	`+ CV_Assert(set != NULL);`
`2550`	`2551`	`CvSetElem* elem = cvGetSetElem( set, index );`
`2551`	`2552`	`if( elem )`
`2552`	`2553`	`cvSetRemoveByPtr( set, elem );`
Original file line number	Diff line number	Diff line change
`@@ -1129,7 +1129,7 @@ Mat Mat::diag(const Mat& d)`
`1129`	`1129`
`1130`	`1130`	`int Mat::checkVector(int _elemChannels, int _depth, bool _requireContinuous) const`
`1131`	`1131`	`{`
`1132`		`- return (depth() == _depth \|\| _depth <= 0) &&`
	`1132`	`+ return data && (depth() == _depth \|\| _depth <= 0) &&`
`1133`	`1133`	`(isContinuous() \|\| !_requireContinuous) &&`
`1134`	`1134`	`((dims == 2 && (((rows == 1 \|\| cols == 1) && channels() == _elemChannels) \|\|`
`1135`	`1135`	`(cols == _elemChannels && channels() == 1))) \|\|`
Original file line number	Diff line number	Diff line change
`@@ -225,6 +225,11 @@ Region::LocationExtraData::LocationExtraData(const LocationStaticStorage& locati`
`225`	`225`	`ittHandle_name = __itt_string_handle_create(location.name);`
`226`	`226`	`ittHandle_filename = __itt_string_handle_create(location.filename);`
`227`	`227`	`}`
	`228`	`+ else`
	`229`	`+ {`
	`230`	`+ ittHandle_name = 0;`
	`231`	`+ ittHandle_filename = 0;`
	`232`	`+ }`
`228`	`233`	`#endif`
`229`	`234`	`}`
`230`	`235`
`@@ -1019,6 +1024,10 @@ struct TraceArg::ExtraData`
`1019`	`1024`	`// Consecutive calls to __itt_string_handle_create with the same name return the same value.`
`1020`	`1025`	`ittHandle_name = __itt_string_handle_create(arg.name);`
`1021`	`1026`	`}`
	`1027`	`+ else`
	`1028`	`+ {`
	`1029`	`+ ittHandle_name = 0;`
	`1030`	`+ }`
`1022`	`1031`	`#endif`
`1023`	`1032`	`}`
`1024`	`1033`	`};`
Original file line number	Diff line number	Diff line change
`@@ -317,9 +317,9 @@ class BackendWrapManager`
`317`	`317`
`318`	`318`	`struct LayerData`
`319`	`319`	`{`
`320`		`- LayerData() {}`
	`320`	`+ LayerData() : id(-1), flag(0) {}`
`321`	`321`	`LayerData(int _id, const String &_name, const String &_type, LayerParams &_params)`
`322`		`- : id(_id), name(_name), type(_type), params(_params)`
	`322`	`+ : id(_id), name(_name), type(_type), params(_params), flag(0)`
`323`	`323`	`{`
`324`	`324`	`//add logging info`
`325`	`325`	`params.name = name;`