har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/imgconvert: fix possible null pointer dereference

Browse Source 
regression since 354b26a3945eadd4ed8fcd801dfefad2566241de
This commit is contained in:
Simon Thelen 2018-04-03 14:41:33 +02:00 committed by Paul B Mahol
parent 4b736bc921
commit 8c2c97403b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/imgconvert.c
View File

@ -72,10 +72,11 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p
int loss; int loss;
for (i=0; pix_fmt_list[i] != AV_PIX_FMT_NONE; i++) { for (i=0; pix_fmt_list[i] != AV_PIX_FMT_NONE; i++) {
loss = *loss_ptr; loss = loss_ptr ? *loss_ptr : 0;
best = avcodec_find_best_pix_fmt_of_2(best, pix_fmt_list[i], src_pix_fmt, has_alpha, &loss); best = avcodec_find_best_pix_fmt_of_2(best, pix_fmt_list[i], src_pix_fmt, has_alpha, &loss);
} }
if (loss_ptr)
*loss_ptr = loss; *loss_ptr = loss;
return best; return best;
} }