Traneptora/FFmpeg
1
Fork 0
forked from FFmpeg/FFmpeg
Code Pull requests Activity

Merge commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b'

Browse source 
* commit 'c3e6e8f06c42499bd020fd0b37f9542150e6067b':
  mem: Do not check unsigned values for negative size

Conflicts:
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-09-06 12:21:16 +02:00
commit 5866c107a9
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libavutil/mem.c
View file

@ -182,7 +182,7 @@ void *av_realloc_f(void *ptr, size_t nelem, size_t elsize)
void *av_realloc_array(void *ptr, size_t nmemb, size_t size) void *av_realloc_array(void *ptr, size_t nmemb, size_t size)
{ {
if (size <= 0 || nmemb >= INT_MAX / size) if (!size || nmemb >= INT_MAX / size)
return NULL; return NULL;
return av_realloc(ptr, nmemb * size); return av_realloc(ptr, nmemb * size);
} }