generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix stack corruption in cvConvexHull2 and heap corruption in OutputArray::create

Browse Source
This commit is contained in:
Andrey Kamaev
2013-03-31 13:24:36 +04:00
parent b28f594917
commit 605382562d
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
modules/imgproc/src/convhull.cpp
View File

@@ -455,7 +455,7 @@ cvConvexHull2( const CvArr* array, void* hull_storage,
hullseq = cvMakeSeqHeaderForArray(
CV_SEQ_KIND_CURVE|CV_MAT_TYPE(mat->type)|CV_SEQ_FLAG_CLOSED,
sizeof(contour_header), CV_ELEM_SIZE(mat->type), mat->data.ptr,
sizeof(hull_header), CV_ELEM_SIZE(mat->type), mat->data.ptr,
mat->cols + mat->rows - 1, &hull_header, &hullblock );
cvClearSeq( hullseq );
}
@@ -475,6 +475,7 @@ cvConvexHull2( const CvArr* array, void* hull_storage,
cv::convexHull(cv::cvarrToMat(ptseq, false, false, 0, &_ptbuf), h0,
orientation == CV_CLOCKWISE, CV_MAT_CN(hulltype) == 2);
if( hulltype == CV_SEQ_ELTYPE_PPOINT )
{
const int* idx = h0.ptr<int>();