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

Fix a bad free space check in icvGrowSeq.

Browse Source 
A difference of two pointers was casted to unsigned which can lead to
overflow on 64-bit systems.
This commit is contained in:
Boris Daskalov 2015-03-17 16:23:03 +02:00 committed by Dikay900
parent 2c73e49dac
commit 3b5530fb67
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/core/src/datastructs.cpp
View File

@ -651,7 +651,7 @@ icvGrowSeq( CvSeq *seq, int in_front_of )
/* If there is a free space just after last allocated block /* If there is a free space just after last allocated block
and it is big enough then enlarge the last block. and it is big enough then enlarge the last block.
This can happen only if the new block is added to the end of sequence: */ This can happen only if the new block is added to the end of sequence: */
if( (unsigned)(ICV_FREE_PTR(storage) - seq->block_max) < CV_STRUCT_ALIGN && if( (size_t)(ICV_FREE_PTR(storage) - seq->block_max) < CV_STRUCT_ALIGN &&
storage->free_space >= seq->elem_size && !in_front_of ) storage->free_space >= seq->elem_size && !in_front_of )
{ {
int delta = storage->free_space / elem_size; int delta = storage->free_space / elem_size;