diff mbox

[FFmpeg-devel,1/9] lavfi/paletteuse: check get_color return value

Message ID 20171108181753.6776-2-timo@rothenpieler.org
State Accepted
Commit 237ccd8a165d2128e8c6bcb14c8c6c3e793cfe05
Headers show

Commit Message

Timo Rothenpieler Nov. 8, 2017, 6:17 p.m. UTC 
Fixes CID #1420396
---
 libavfilter/vf_paletteuse.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Comments

Timo Rothenpieler Nov. 13, 2017, 7:50 p.m. UTC | #1 
applied
diff mbox

Patch

diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c
index ed80ab04d5..1980907e70 100644
--- a/libavfilter/vf_paletteuse.c
+++ b/libavfilter/vf_paletteuse.c
@@ -380,8 +380,11 @@  static av_always_inline int get_dst_color_err(PaletteUseContext *s,
     const uint8_t r = c >> 16 & 0xff;
     const uint8_t g = c >>  8 & 0xff;
     const uint8_t b = c       & 0xff;
+    uint32_t dstc;
     const int dstx = color_get(s, c, a, r, g, b, search_method);
-    const uint32_t dstc = s->palette[dstx];
+    if (dstx < 0)
+        return dstx;
+    dstc = s->palette[dstx];
     *er = r - (dstc >> 16 & 0xff);
     *eg = g - (dstc >>  8 & 0xff);
     *eb = b - (dstc       & 0xff);