diff options
| author | Simon Thelen <ffmpeg-dev@c-14.de> | 2018-04-03 14:41:33 +0200 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2018-07-15 16:33:08 +0300 |
| commit | c1e172c2e14ef059dac632f7c67f081dfecd30dc (patch) | |
| tree | e631f134de784d5eb14ba09389ad3c58b9fd0221 /libavcodec | |
| parent | 89355585366b16238244decae40fbe0cc7ae3e40 (diff) | |
| download | ffmpeg-c1e172c2e14ef059dac632f7c67f081dfecd30dc.tar.gz | |
avcodec/imgconvert: fix possible null pointer dereference
regression since 354b26a3945eadd4ed8fcd801dfefad2566241de
(cherry picked from commit 8c2c97403baf95d0facb53f03e468f023eb943e1)
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/imgconvert.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 7b0005b308..1fd636c83d 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -72,11 +72,12 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p int loss; 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); } - *loss_ptr = loss; + if (loss_ptr) + *loss_ptr = loss; return best; } |