virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '7ebb3022297aa00afda6800105684b8303f2608e'

Browse Source 
* commit '7ebb3022297aa00afda6800105684b8303f2608e':
  swscale: Check memory allocation

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-22 03:40:17 +01:00
commit 324067d18b
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libswscale/utils.c
View File

@ -1608,17 +1608,13 @@ SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
filter->chrV = sws_getIdentityVec(); filter->chrV = sws_getIdentityVec();
} }
if (!filter->lumH || !filter->lumV || !filter->chrH || !filter->chrV) { if (!filter->lumH || !filter->lumV || !filter->chrH || !filter->chrV)
sws_freeVec(filter->lumH); goto fail;
sws_freeVec(filter->lumV);
sws_freeVec(filter->chrH);
sws_freeVec(filter->chrV);
av_freep(&filter);
return NULL;
}
if (chromaSharpen != 0.0) { if (chromaSharpen != 0.0) {
SwsVector *id = sws_getIdentityVec(); SwsVector *id = sws_getIdentityVec();
if (!id)
goto fail;
sws_scaleVec(filter->chrH, -chromaSharpen); sws_scaleVec(filter->chrH, -chromaSharpen);
sws_scaleVec(filter->chrV, -chromaSharpen); sws_scaleVec(filter->chrV, -chromaSharpen);
sws_addVec(filter->chrH, id); sws_addVec(filter->chrH, id);
@ -1628,6 +1624,8 @@ SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
if (lumaSharpen != 0.0) { if (lumaSharpen != 0.0) {
SwsVector *id = sws_getIdentityVec(); SwsVector *id = sws_getIdentityVec();
if (!id)
goto fail;
sws_scaleVec(filter->lumH, -lumaSharpen); sws_scaleVec(filter->lumH, -lumaSharpen);
sws_scaleVec(filter->lumV, -lumaSharpen); sws_scaleVec(filter->lumV, -lumaSharpen);
sws_addVec(filter->lumH, id); sws_addVec(filter->lumH, id);
@ -1652,6 +1650,14 @@ SwsFilter *sws_getDefaultFilter(float lumaGBlur, float chromaGBlur,
sws_printVec2(filter->lumH, NULL, AV_LOG_DEBUG); sws_printVec2(filter->lumH, NULL, AV_LOG_DEBUG);
return filter; return filter;
fail:
sws_freeVec(filter->lumH);
sws_freeVec(filter->lumV);
sws_freeVec(filter->chrH);
sws_freeVec(filter->chrV);
av_freep(&filter);
return NULL;
} }
SwsVector *sws_allocVec(int length) SwsVector *sws_allocVec(int length)