avcodec/imgconvert: fix possible null pointer dereference

regression since 354b26a3 (cherry picked from commit 8c2c9740)

avcodec/imgconvert: fix possible null pointer dereference
regression since 354b26a3 (cherry picked from commit 8c2c9740)
c1e172c2 · Simon Thelen · Jan Ekström · 89355585 · c1e172c2
Commit c1e172c2 authored Apr 03, 2018 by Simon Thelen Committed by Jan Ekström Jul 15, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

imgconvert.c libavcodec/imgconvert.c +3 -2

No files found.
--- 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;
 }