Fixed several issues found by static analysis in core module

mshabunin · mshabunin · commit b04ed5956e9e · 2017-05-23T12:35:31.000+03:00
diff --git a/modules/core/include/opencv2/core/mat.inl.hpp b/modules/core/include/opencv2/core/mat.inl.hpp
@@ -872,7 +872,7 @@ size_t Mat::step1(int i) const
 inline
 bool Mat::empty() const
 {
-    return data == 0 || total() == 0;
+    return data == 0 || total() == 0 || dims == 0;
 }
 
 inline
@@ -3730,7 +3730,7 @@ size_t UMat::step1(int i) const
 inline
 bool UMat::empty() const
 {
-    return u == 0 || total() == 0;
+    return u == 0 || total() == 0 || dims == 0;
 }
 
 inline
diff --git a/modules/core/include/opencv2/core/types.hpp b/modules/core/include/opencv2/core/types.hpp
@@ -1040,7 +1040,8 @@ Complex<_Tp> operator / (const Complex<_Tp>& a, const Complex<_Tp>& b)
 template<typename _Tp> static inline
 Complex<_Tp>& operator /= (Complex<_Tp>& a, const Complex<_Tp>& b)
 {
-    return (a = a / b);
+    a = a / b;
+    return a;
 }
 
 template<typename _Tp> static inline
diff --git a/modules/core/src/arithm.cpp b/modules/core/src/arithm.cpp
@@ -523,7 +523,7 @@ static bool ocl_arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,
     float usrdata_f[3];
     int i, n = oclop == OCL_OP_MUL_SCALE || oclop == OCL_OP_DIV_SCALE ||
         oclop == OCL_OP_RDIV_SCALE || oclop == OCL_OP_RECIP_SCALE ? 1 : oclop == OCL_OP_ADDW ? 3 : 0;
-    if( n > 0 && wdepth == CV_32F )
+    if( usrdata && n > 0 && wdepth == CV_32F )
     {
         for( i = 0; i < n; i++ )
             usrdata_f[i] = (float)usrdata_d[i];
diff --git a/modules/core/src/array.cpp b/modules/core/src/array.cpp
@@ -545,7 +545,7 @@ cvCreateSparseMat( int dims, const int* sizes, int type )
     if( pix_size == 0 )
         CV_Error( CV_StsUnsupportedFormat, "invalid array data type" );
 
-    if( dims <= 0 || dims > CV_MAX_DIM_HEAP )
+    if( dims <= 0 || dims > CV_MAX_DIM )
         CV_Error( CV_StsOutOfRange, "bad number of dimensions" );
 
     if( !sizes )
@@ -1839,6 +1839,7 @@ cvPtr2D( const CvArr* arr, int y, int x, int* _type )
     }
     else if( CV_IS_SPARSE_MAT( arr ))
     {
+        CV_Assert(((CvSparseMat*)arr)->dims == 2);
         int idx[] = { y, x };
         ptr = icvGetNodePtr( (CvSparseMat*)arr, idx, _type, 1, 0 );
     }
diff --git a/modules/core/src/copy.cpp b/modules/core/src/copy.cpp
@@ -448,6 +448,7 @@ Mat& Mat::operator = (const Scalar& s)
             for( size_t j = 0; j < elsize; j += blockSize )
             {
                 size_t sz = MIN(blockSize, elsize - j);
+                CV_Assert(sz <= sizeof(scalar));
                 memcpy( dptr + j, scalar, sz );
             }
         }
diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp
@@ -5786,10 +5786,10 @@ void minMaxLoc( const SparseMat& src, double* _minval, double* _maxval, int* _mi
     else
         CV_Error( CV_StsUnsupportedFormat, "Only 32f and 64f are supported" );
 
-    if( _minidx )
+    if( _minidx && minidx )
         for( i = 0; i < d; i++ )
             _minidx[i] = minidx[i];
-    if( _maxidx )
+    if( _maxidx && maxidx )
         for( i = 0; i < d; i++ )
             _maxidx[i] = maxidx[i];
 }
@@ -5898,7 +5898,7 @@ _IplImage::_IplImage(const cv::Mat& m)
 
 CvSparseMat* cvCreateSparseMat(const cv::SparseMat& sm)
 {
-    if( !sm.hdr )
+    if( !sm.hdr || sm.hdr->dims > (int)cv::SparseMat::MAX_DIM)
         return 0;
 
     CvSparseMat* m = cvCreateSparseMat(sm.hdr->dims, sm.hdr->size, sm.type());
diff --git a/modules/core/src/ocl.cpp b/modules/core/src/ocl.cpp
@@ -1204,7 +1204,7 @@ static cl_device_id selectOpenCLDevice()
     if (!configuration)
         return NULL; // suppress messages on stderr
 
-    std::cerr << "ERROR: Requested OpenCL device not found, check configuration: " << (configuration == NULL ? "" : configuration) << std::endl
+    std::cerr << "ERROR: Requested OpenCL device not found, check configuration: " << configuration << std::endl
             << "    Platform: " << (platform.length() == 0 ? "any" : platform) << std::endl
             << "    Device types: ";
     for (size_t t = 0; t < deviceTypes.size(); t++)
diff --git a/modules/core/src/out.cpp b/modules/core/src/out.cpp
@@ -103,7 +103,7 @@ namespace cv
             }
             else
             {
-                sprintf(floatFormat, "%%.%dg", std::min(precision, 20));
+                snprintf(floatFormat, 8, "%%.%dg", std::min(precision, 20));
             }
 
             switch(mtx.depth())
diff --git a/modules/core/src/parallel_pthreads.cpp b/modules/core/src/parallel_pthreads.cpp
@@ -141,10 +141,10 @@ class ForThread
     pthread_t       m_posix_thread;
     pthread_mutex_t m_thread_mutex;
     pthread_cond_t  m_cond_thread_task;
-    bool            m_task_start;
+    volatile bool   m_task_start;
 
     ThreadManager*  m_parent;
-    ForThreadState  m_state;
+    volatile ForThreadState m_state;
     size_t          m_id;
 };
 
diff --git a/modules/core/src/persistence.cpp b/modules/core/src/persistence.cpp
diff --git a/modules/core/src/rand.cpp b/modules/core/src/rand.cpp
diff --git a/modules/core/src/stat.cpp b/modules/core/src/stat.cpp
diff --git a/modules/core/src/umatrix.cpp b/modules/core/src/umatrix.cpp

Original file line number	Diff line number	Diff line change
`@@ -872,7 +872,7 @@ size_t Mat::step1(int i) const`
`872`	`872`	`inline`
`873`	`873`	`bool Mat::empty() const`
`874`	`874`	`{`
`875`		`- return data == 0 \|\| total() == 0;`
	`875`	`+ return data == 0 \|\| total() == 0 \|\| dims == 0;`
`876`	`876`	`}`
`877`	`877`
`878`	`878`	`inline`
`@@ -3730,7 +3730,7 @@ size_t UMat::step1(int i) const`
`3730`	`3730`	`inline`
`3731`	`3731`	`bool UMat::empty() const`
`3732`	`3732`	`{`
`3733`		`- return u == 0 \|\| total() == 0;`
	`3733`	`+ return u == 0 \|\| total() == 0 \|\| dims == 0;`
`3734`	`3734`	`}`
`3735`	`3735`
`3736`	`3736`	`inline`
Original file line number	Diff line number	Diff line change
`@@ -1040,7 +1040,8 @@ Complex<_Tp> operator / (const Complex<_Tp>& a, const Complex<_Tp>& b)`
`1040`	`1040`	`template<typename _Tp> static inline`
`1041`	`1041`	`Complex<_Tp>& operator /= (Complex<_Tp>& a, const Complex<_Tp>& b)`
`1042`	`1042`	`{`
`1043`		`- return (a = a / b);`
	`1043`	`+ a = a / b;`
	`1044`	`+ return a;`
`1044`	`1045`	`}`
`1045`	`1046`
`1046`	`1047`	`template<typename _Tp> static inline`
Original file line number	Diff line number	Diff line change
`@@ -523,7 +523,7 @@ static bool ocl_arithm_op(InputArray _src1, InputArray _src2, OutputArray _dst,`
`523`	`523`	`float usrdata_f[3];`
`524`	`524`	`int i, n = oclop == OCL_OP_MUL_SCALE \|\| oclop == OCL_OP_DIV_SCALE \|\|`
`525`	`525`	`oclop == OCL_OP_RDIV_SCALE \|\| oclop == OCL_OP_RECIP_SCALE ? 1 : oclop == OCL_OP_ADDW ? 3 : 0;`
`526`		`- if( n > 0 && wdepth == CV_32F )`
	`526`	`+ if( usrdata && n > 0 && wdepth == CV_32F )`
`527`	`527`	`{`
`528`	`528`	`for( i = 0; i < n; i++ )`
`529`	`529`	`usrdata_f[i] = (float)usrdata_d[i];`
Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,7 @@ cvCreateSparseMat( int dims, const int* sizes, int type )`
`545`	`545`	`if( pix_size == 0 )`
`546`	`546`	`CV_Error( CV_StsUnsupportedFormat, "invalid array data type" );`
`547`	`547`
`548`		`- if( dims <= 0 \|\| dims > CV_MAX_DIM_HEAP )`
	`548`	`+ if( dims <= 0 \|\| dims > CV_MAX_DIM )`
`549`	`549`	`CV_Error( CV_StsOutOfRange, "bad number of dimensions" );`
`550`	`550`
`551`	`551`	`if( !sizes )`
`@@ -1839,6 +1839,7 @@ cvPtr2D( const CvArr* arr, int y, int x, int* _type )`
`1839`	`1839`	`}`
`1840`	`1840`	`else if( CV_IS_SPARSE_MAT( arr ))`
`1841`	`1841`	`{`
	`1842`	`+ CV_Assert(((CvSparseMat*)arr)->dims == 2);`
`1842`	`1843`	`int idx[] = { y, x };`
`1843`	`1844`	`ptr = icvGetNodePtr( (CvSparseMat*)arr, idx, _type, 1, 0 );`
`1844`	`1845`	`}`
Original file line number	Diff line number	Diff line change
`@@ -448,6 +448,7 @@ Mat& Mat::operator = (const Scalar& s)`
`448`	`448`	`for( size_t j = 0; j < elsize; j += blockSize )`
`449`	`449`	`{`
`450`	`450`	`size_t sz = MIN(blockSize, elsize - j);`
	`451`	`+ CV_Assert(sz <= sizeof(scalar));`
`451`	`452`	`memcpy( dptr + j, scalar, sz );`
`452`	`453`	`}`
`453`	`454`	`}`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ namespace cv`
`103`	`103`	`}`
`104`	`104`	`else`
`105`	`105`	`{`
`106`		`- sprintf(floatFormat, "%%.%dg", std::min(precision, 20));`
	`106`	`+ snprintf(floatFormat, 8, "%%.%dg", std::min(precision, 20));`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`switch(mtx.depth())`