From eda78c8b7f8a0e4728344f97700960f022eee6d2 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Sun, 12 Mar 2017 12:48:01 +0100 Subject: [PATCH] avcodec/xpmdec: make convert function more picky about its input Signed-off-by: Paul B Mahol --- libavcodec/xpmdec.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c index 3f01a8f002..8d5bc76ab2 100644 --- a/libavcodec/xpmdec.c +++ b/libavcodec/xpmdec.c @@ -185,15 +185,16 @@ static const ColorEntry color_table[] = { { "YellowGreen", 0xFF9ACD32 } }; -static int convert(uint8_t x) +static unsigned convert(uint8_t x) { - if (x >= 'a') { + if (x >= 'a' && x <= 'f') x -= 87; - } else if (x >= 'A') { + else if (x >= 'A' && x <= 'F') x -= 55; - } else { + else if (x >= '0' && x <= '9') x -= '0'; - } + else + x = 0; return x; }