Merge pull request #3093 from asmorkalov:ocv_array_bound_fix

988555a5 · Vadim Pisarevsky · af2434c5 · e11333dd · 988555a5
Commit 988555a5 authored Aug 13, 2014 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

floodfill.cpp modules/imgproc/src/floodfill.cpp +6 -0

No files found.
--- a/modules/imgproc/src/floodfill.cpp
+++ b/modules/imgproc/src/floodfill.cpp
@@ -470,6 +470,12 @@ cvFloodFill( CvArr* arr, CvPoint seed_point,
    depth = CV_MAT_DEPTH(type);
    cn = CV_MAT_CN(type);

+    if ( (cn != 1) && (cn != 3) )
+    {
+        CV_Error( CV_StsBadArg, "Number of channels in input image must be 1 or 3" );
+        return;
+    }
+
    if( connectivity == 0 )
        connectivity = 4;
    else if( connectivity != 4 && connectivity != 8 )