Merge pull request #13112 from alalek:fix_coverity_reports_3.4

6 years ago · 265cb58750
parent b5610e77a7 801c943009
commit 265cb58750
2 changed files with 4 additions and 3 deletions
--- a/modules/dnn/src/dnn.cpp
+++ b/modules/dnn/src/dnn.cpp
@ -1801,7 +1801,7 @@ struct Net::Impl
                        nextEltwiseLayer = nextData->layerInstance.dynamicCast<EltwiseLayer>();

                    if( !nextEltwiseLayer.empty() && pinsToKeep.count(lpNext) == 0 &&
-                        nextData->inputBlobsId.size() == 2 )
+                        nextData && nextData->inputBlobsId.size() == 2 )
                    {
                        LayerData *eltwiseData = nextData;

--- a/modules/videoio/src/cap_v4l.cpp
+++ b/modules/videoio/src/cap_v4l.cpp
@ -348,7 +348,9 @@ struct CvCaptureCAM_V4L CV_FINAL : public CvCapture
 /***********************   Implementations  ***************************************/

 CvCaptureCAM_V4L::CvCaptureCAM_V4L() : deviceHandle(-1), bufferIndex(-1)
-{}
+{
+    memset(&timestamp, 0, sizeof(timestamp));
+}

 CvCaptureCAM_V4L::~CvCaptureCAM_V4L() {
    streaming(false);
@ -1739,7 +1741,6 @@ double CvCaptureCAM_V4L::getProperty(int property_id) const
        return  value;
    }
    }
-    return -1.0;
 }

 bool CvCaptureCAM_V4L::icvSetFrameSize(int _width, int _height)