mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-12 12:22:51 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix imageSize overflow in IplImage

Browse Source
This commit is contained in:
Vincent Rabaud 2016-09-21 16:30:31 +02:00
parent 157a90ac46
commit a89aa8c90a
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
modules/core/src/array.cpp
View File

@ -834,6 +834,9 @@ cvCreateData( CvArr* arr )
if( !CvIPL.allocateData ) if( !CvIPL.allocateData )
{ {
const int64 imageSize_tmp = (int64)img->widthStep*(int64)img->height;
if( (int64)img->imageSize != imageSize_tmp )
CV_Error( CV_StsNoMem, "Overflow for imageSize" );
img->imageData = img->imageDataOrigin = img->imageData = img->imageDataOrigin =
(char*)cvAlloc( (size_t)img->imageSize ); (char*)cvAlloc( (size_t)img->imageSize );
} }
@ -941,7 +944,10 @@ cvSetData( CvArr* arr, void* data, int step )
img->widthStep = min_step; img->widthStep = min_step;
} }
img->imageSize = img->widthStep * img->height; const int64 imageSize_tmp = (int64)img->widthStep*(int64)img->height;
img->imageSize = (int)imageSize_tmp;
if( (int64)img->imageSize != imageSize_tmp )
CV_Error( CV_StsNoMem, "Overflow for imageSize" );
img->imageData = img->imageDataOrigin = (char*)data; img->imageData = img->imageDataOrigin = (char*)data;
if( (((int)(size_t)data | step) & 7) == 0 && if( (((int)(size_t)data | step) & 7) == 0 &&
@ -2958,7 +2964,10 @@ cvInitImageHeader( IplImage * image, CvSize size, int depth,
image->widthStep = (((image->width * image->nChannels * image->widthStep = (((image->width * image->nChannels *
(image->depth & ~IPL_DEPTH_SIGN) + 7)/8)+ align - 1) & (~(align - 1)); (image->depth & ~IPL_DEPTH_SIGN) + 7)/8)+ align - 1) & (~(align - 1));
image->origin = origin; image->origin = origin;
image->imageSize = image->widthStep * image->height; const int64 imageSize_tmp = (int64)image->widthStep*(int64)image->height;
image->imageSize = (int)imageSize_tmp;
if( (int64)image->imageSize != imageSize_tmp )
CV_Error( CV_StsNoMem, "Overflow for imageSize" );
return image; return image;
} }