Merge pull request opencv#8988 from sovrasov:repeat_src_eq_dst_fix

vpisarev · vpisarev · commit ef2e5a9f8218 · 2017-06-26T21:58:26.000Z
diff --git a/modules/core/src/copy.cpp b/modules/core/src/copy.cpp
@@ -856,6 +856,7 @@ void repeat(InputArray _src, int ny, int nx, OutputArray _dst)
 {
     CV_INSTRUMENT_REGION()
 
+    CV_Assert(_src.getObj() != _dst.getObj());
     CV_Assert( _src.dims() <= 2 );
     CV_Assert( ny > 0 && nx > 0 );
 
diff --git a/modules/core/test/test_misc.cpp b/modules/core/test/test_misc.cpp
@@ -145,3 +145,12 @@ TEST(Core_String, end_method_regression)
     cv::String new_string(old_string.begin(), old_string.end());
     EXPECT_EQ(6u, new_string.size());
 }
+
+TEST(Core_Copy, repeat_regression_8972)
+{
+    Mat src = (Mat_<int>(1, 4) << 1, 2, 3, 4);
+
+    ASSERT_ANY_THROW({
+                         repeat(src, 5, 1, src);
+                     });
+}

Original file line number	Diff line number	Diff line change
`@@ -856,6 +856,7 @@ void repeat(InputArray _src, int ny, int nx, OutputArray _dst)`
`856`	`856`	`{`
`857`	`857`	`CV_INSTRUMENT_REGION()`
`858`	`858`
	`859`	`+ CV_Assert(_src.getObj() != _dst.getObj());`
`859`	`860`	`CV_Assert( _src.dims() <= 2 );`
`860`	`861`	`CV_Assert( ny > 0 && nx > 0 );`
`861`	`862`