fix potential buffer overflow as in 3.0

10 years ago · 2799829bc9
parent 0f288d1082
commit 2799829bc9
1 changed files with 1 additions and 1 deletions
--- a/modules/imgproc/src/canny.cpp
+++ b/modules/imgproc/src/canny.cpp
@ -230,7 +230,7 @@ void cv::Canny( InputArray _src, OutputArray _dst,
        if ((stack_top - stack_bottom) + src.cols > maxsize)
        {
            int sz = (int)(stack_top - stack_bottom);
-            maxsize = maxsize * 3/2;
+            maxsize = std::max(sz + src.cols, maxsize * 3/2);
            stack.resize(maxsize);
            stack_bottom = &stack[0];
            stack_top = stack_bottom + sz;