fixing segfaults occuring when launching those unit tests

devnexen · David Carlier · commit bacc21060603 · 2017-04-18T09:50:17.000+01:00
diff --git a/modules/calib3d/test/test_cameracalibration.cpp b/modules/calib3d/test/test_cameracalibration.cpp
@@ -1570,7 +1570,8 @@ void CV_StereoCalibrationTest::run( int )
         {
             ts->printf( cvtest::TS::LOG, "The file %s can not be opened or has invalid content\n", filepath.c_str() );
             ts->set_failed_test_info( f ? cvtest::TS::FAIL_INVALID_TEST_DATA : cvtest::TS::FAIL_MISSING_TEST_DATA );
-            fclose(f);
+            if (f)
+                fclose(f);
             return;
         }
 
diff --git a/modules/ml/src/lr.cpp b/modules/ml/src/lr.cpp
@@ -138,6 +138,9 @@ bool LogisticRegressionImpl::train(const Ptr<TrainData>& trainData, int)
     // return value
     bool ok = false;
 
+    if (trainData.empty()) {
+        return false;
+    }
     clear();
     Mat _data_i = trainData->getSamples();
     Mat _labels_i = trainData->getResponses();
diff --git a/modules/ml/test/test_emknearestkmeans.cpp b/modules/ml/test/test_emknearestkmeans.cpp
@@ -618,6 +618,7 @@ class CV_EMTest_Classification : public cvtest::BaseTest
         {
             ts->printf(cvtest::TS::LOG, "File with spambase dataset cann't be read.\n");
             ts->set_failed_test_info(cvtest::TS::FAIL_INVALID_TEST_DATA);
+            return;
         }
 
         Mat samples = data->getSamples();
diff --git a/modules/ml/test/test_lr.cpp b/modules/ml/test/test_lr.cpp
@@ -95,6 +95,11 @@ void CV_LRTest::run( int /*start_from*/ )
     string dataFileName = ts->get_data_path() + "iris.data";
     Ptr<TrainData> tdata = TrainData::loadFromCSV(dataFileName, 0);
 
+    if (tdata.empty()) {
+        ts->set_failed_test_info(cvtest::TS::FAIL_INVALID_TEST_DATA);
+        return;
+    }
+
     // run LR classifier train classifier
     Ptr<LogisticRegression> p = LogisticRegression::create();
     p->setLearningRate(1.0);
diff --git a/modules/shape/test/test_shape.cpp b/modules/shape/test/test_shape.cpp
@@ -83,6 +83,9 @@ class ShapeBaseTest : public cvtest::BaseTest
 
     vector<PointType> convertContourType(const Mat& currentQuery) const
     {
+        if (currentQuery.empty()) {
+            return vector<PointType>();
+        }
         vector<vector<Point> > _contoursQuery;
         findContours(currentQuery, _contoursQuery, RETR_LIST, CHAIN_APPROX_NONE);
 

Original file line number	Diff line number	Diff line change
`@@ -1570,7 +1570,8 @@ void CV_StereoCalibrationTest::run( int )`
`1570`	`1570`	`{`
`1571`	`1571`	`ts->printf( cvtest::TS::LOG, "The file %s can not be opened or has invalid content\n", filepath.c_str() );`
`1572`	`1572`	`ts->set_failed_test_info( f ? cvtest::TS::FAIL_INVALID_TEST_DATA : cvtest::TS::FAIL_MISSING_TEST_DATA );`
`1573`		`- fclose(f);`
	`1573`	`+ if (f)`
	`1574`	`+ fclose(f);`
`1574`	`1575`	`return;`
`1575`	`1576`	`}`
`1576`	`1577`
Original file line number	Diff line number	Diff line change
`@@ -618,6 +618,7 @@ class CV_EMTest_Classification : public cvtest::BaseTest`
`618`	`618`	`{`
`619`	`619`	`ts->printf(cvtest::TS::LOG, "File with spambase dataset cann't be read.\n");`
`620`	`620`	`ts->set_failed_test_info(cvtest::TS::FAIL_INVALID_TEST_DATA);`
	`621`	`+ return;`
`621`	`622`	`}`
`622`	`623`
`623`	`624`	`Mat samples = data->getSamples();`
Original file line number	Diff line number	Diff line change
`@@ -83,6 +83,9 @@ class ShapeBaseTest : public cvtest::BaseTest`
`83`	`83`
`84`	`84`	`vector<PointType> convertContourType(const Mat& currentQuery) const`
`85`	`85`	`{`
	`86`	`+ if (currentQuery.empty()) {`
	`87`	`+ return vector<PointType>();`
	`88`	`+ }`
`86`	`89`	`vector<vector<Point> > _contoursQuery;`
`87`	`90`	`findContours(currentQuery, _contoursQuery, RETR_LIST, CHAIN_APPROX_NONE);`
`88`	`91`